Modified file.
Merge branch 'master' of https://github.com/Para0001/testgitrepo1.git

Conflicts:
	javatestgit/src/frostpeak/game/App.java