just getting ready for pull. no big changes, I used different sprites and gave my floors a parent (OUPS)
Merge github.com:Logicon211/LAMER into Mitchel

Conflicts:
	objects/Level_Floor2.object.gmx
	rooms/Stage4.room.gmx
rsdfsdfsdf

sword not a gun
is the sword shoot
Merge branch 'master' of github.com:Logicon211/LAMER