no message
Merge branch 'master' of https://github.com/ricky-flyguy/RMZ_2014

Conflicts:
	.gitignore
	Game2014/Classes/MainMenu.h
	Game2014/Classes/Options.h