reg
reg fixes
Merge branch 'Ians-branch' of https://github.com/seleb/GameJam2014 into Ians-branch
started generatemap function

nothing really in it yet but ive got to figureout this branch merge
Merge branch 'Ians-branch' of https://github.com/seleb/GameJam2014 into Ians-branch
stuff
Merge branch 'Ians-branch' of https://github.com/seleb/GameJam2014 into Ians-branch
level tilemap generation

generator a level tile map, taking into account screen size, and
randomly insert a gap in one of the floors for a trapdoor
fix merge from ian to master