george's commit
Merge branch 'master' of github.com:thetmkay/disrupt

Conflicts:
	stacktimer.xcodeproj/project.pbxproj