Merge branch 'master' of https://github.com/Vargrul/HorrorGame.git

Conflicts:
	HorrorGame/src/mta13438/Loader.java
Merge branch 'master' of https://github.com/Vargrul/HorrorGame.git