Merge pull request #1 from joshchapman/master

movement
Merge pull request #2 from joshchapman/master

lights
Collision detection being implemented