added collision detection for Lady Java
added missing files
prepared tileMap and collision class for added entrances to other tileMaps
All rooms as of 11/11/2013
Merge branch 'collision' into develop
solving conflicts
Merge branch 'develop' of github.com:gmansilla/AOL into npc
adding game1 file again, due to human error
edit gitignore
Merge branch 'develop' of github.com:gmansilla/AOL into npc
dot Maps sorted, sprites fixed
Merge branch 'develop' of github.com:gmansilla/AOL into npc
added entrances to the tileMapEditor
merging develop with collision
fixing merge with collision
continuing to fix merge
fixed bug with entrance map
merged collision and added dungeon project
fixed overworld.map
fix crash bug for rectangle tile maps