Working on making functions so the gui can actually select a study
Merge branch 'master' of https://github.com/Ourobor/petulant-batman

Conflicts:
	javaproject/src/Director/Director.java