updates i guess
Merge branch 'master' of https://github.com/kari0003/TombEscape

Conflicts:
	core/src/main/TombEscapeGame.java
Tely