Merge
Merge branch 'master' of https://github.com/Goforhistory/IN2_prg_practice

Conflicts:
	src/gui/Controller.java
	src/gui/MainApp.java