Merge
Merge branch 'master' of https://github.com/Majoo/Create

Conflicts:
	src/se/chalmers/tda367/group25/resumate/controllers/MainController.java