Merge resolution
Merge branch 'master' of https://github.com/jmduke/Barback

Conflicts:
	Barback.xcodeproj/project.pbxproj