Merging changes
Merge branch 'master' of github.com:tlein/GameJam2013
Merge
Merge branch 'master' of github.com:tlein/GameJam2013
Merging
Merge branch 'master' of github.com:tlein/GameJam2013

Conflicts:
	src/org/mosque/entities/Player.java
Merge
Merge branch 'master' of github.com:tlein/GameJam2013

Conflicts:
	src/org/mosque/states/LevelState.java
Fixing shit
starting adding solids
Merge branch 'master' into tucker
moved GridEntity's children's map to GridEntity