restart
Merge branch 'master' of https://github.com/bensonz/TripleKillerSingleSinger

Conflicts:
	Pulp.xcodeproj/project.xcworkspace/xcshareddata/Pulp.xccheckout

Pulp.xcodeproj/project.xcworkspace/xcuserdata/Antonio.xcuserdatad/UserIn
terfaceState.xcuserstate