have to commit to pull
Merge branch 'master' of https://github.com/ribab/Zed.git
Made a zombie and put him in the game

This is where I got the art from, and then I scaled and edited it to fit
16x32
http://opengameart.org/content/zombie-and-skeleton-32x48
Merge branch 'master' of https://github.com/ribab/Zed.git

Conflicts:
	Zed-Eclipse/.classpath
	Zed-Eclipse/bin/zed/File_Manager.class
	Zed-Eclipse/bin/zed/Level_Manager.class
	Zed-Eclipse/bin/zed/Player_Character.class