Commit add to index
Merge branch 'master' of https://github.com/Skrechy/Zombieland.git
test
Merge branch 'master' of https://github.com/Skrechy/Zombieland.git

Conflicts:
	ZombieLand/src/game/Screen.java
Commit delete x