intermediate
t commit
y
ls

 Merge branch 'master' of https://github.com/scheuchi/MadMummies

Conflicts:
	code/MadMummies/binRelease/MadMummies.exe
	code/MadMummies/binRelease/MadMummies.pdb
added textures, colission detection