Boss stuff
Merge branch 'master' of https://github.com/remlerelyk/Rpg-character-creation

Conflicts:
	ViewControllerMain.h