5-a-ticking-clock
Merge branch 'master' of github.com:stanidesis/swiftris-checkpoint-commits

Conflicts:
	Swiftris.xcodeproj/project.xcworkspace/xcuserdata/stan.xcuserdatad/UserInterfaceState.xcuserstate
	Swiftris/GameScene.swift