Merge pull request #9 from Sigma-Delta-Blah/Joe

Joe
Update README.md
Merge branch 'master' into Matthew
Merge branch 'Joe'
Update README.md
Merge remote-tracking branch 'origin/master' into Matthew
This should work??
Merge branch 'Joe'
Merge branch 'master' of https://github.com/Sigma-Delta-Blah/PlatformerJoy
Merge branch 'master' into Matthew
Basic tile class functioning.  Still need to change anchor point to bottom left of tile, and resize tiles
Fixed the map generator, extremely rudimentary implementation of the “Tile” class.  Map generator should be finished.  The next objective is to link the map generator to a TileMapData to generate the map based off of a file.
Merging completed map generator system.
Merge branch 'master' into Joe

Conflicts:

PlatformerJoy.xcodeproj/project.xcworkspace/xcuserdata/Joe.xcuserdatad/U
serInterfaceState.xcuserstate
	PlatformerJoy/TileMap.m