static room
map tileset
Add 2 levels
Merge branch 'master' into creating-a-room

Conflicts:
	Tiny/Tiny/Game1.cs