Signed-off-by: Emil hein <Emil@Emil-Pc>
Merge branch 'master' of https://github.com/emilhein/16_02325.git

Conflicts:
	build/classes/controller/Controller.class