organize files after merge
David's changes to the floor's and sprites. Lighting was also messed with to resemble a flashlight (currently broken)