Merge branch 'develop' of github.com:dopefishh/bachelor into develop