Merge branch 'collision' into develop
All rooms as of 11/11/2013
Merge branch 'collision' into develop
solving conflicts
adding game1 file again, due to human error
edit gitignore
dot Maps sorted, sprites fixed
added entrances to the tileMapEditor
merging develop with collision
fixing merge with collision
continuing to fix merge
fixed bug with entrance map
fix crash bug for rectangle tile maps