dev
Merge branch 'master' of https://github.com/gurre/dat055-proj-grp7

Conflicts:
	Controller.java