new file:   Hallways/bkg.png
	new file:   Hallways/combat.py
	new file:   Hallways/combat.py.bak
	new file:   Hallways/combat.pyc
	new file:   Hallways/goblin.png
	new file:   Hallways/highlight.png
	new file:   Hallways/knight.png
	new file:   Hallways/knight2.png
	new file:   Hallways/knight3.png
	new file:   Hallways/main.py
	new file:   Hallways/main.py.bak
	new file:   Hallways/main2.py
	new file:   Hallways/main2.py.bak
	new file:   Hallways/mob.py
	new file:   Hallways/mob.py.bak
	new file:   Hallways/mob.pyc
	new file:   Hallways/package.py
	new file:   Hallways/package.py.bak
	new file:   Hallways/package.pyc
	new file:   Hallways/skill.png
	new file:   Hallways/skill.py
	new file:   Hallways/skill.py.bak
	new file:   Hallways/skill.pyc
	new file:   Hallways/weapon.py
	new file:   Hallways/weapon.pyc
	new file:   Hallways/window.py
	new file:   Hallways/window.py.bak
	new file:   Hallways/window.pyc
	new file:   Hallways/windowtest.py
Merge branch 'master' of https://github.com/nebathemonk/hallways