Stuff and things
Merge branch 'master' of https://github.com/Ourobor/petulant-batman

Conflicts:
	javaproject/src/Study/ReconstuctedStudy.java