More stuff
Merge branch 'master' of https://github.com/BumpNasty/BumpNasty-iOS

Conflicts:
	BumpNasty.xcodeproj/project.pbxproj

Yes