Merge branch 'master' into Matthew
Merge branch 'master3' into Matthew
Added bounce and collapse tiles
Added an option to add a separate parameter to set the tile texture through setFunction method.
Merge branch 'Matthew'
Derp. :P
Merge branch 'Matthew'
hjwkbgsfhhktjgn
Merge branch 'master' into Matthew
uyitw78gqruyaf6grfy
hbj2de
Merge branch 'Matthew' of https://github.com/Sigma-Delta-Blah/PlatformerJoy into Matthew

Conflicts:

PlatformerJoy.xcodeproj/project.xcworkspace/xcuserdata/Joe.xcuserdatad/U
serInterfaceState.xcuserstate
Merge branch 'Matthew'

Conflicts:

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