Do not track
Merge branch 'master' of https://github.com/Barney-365-Fall-2104/Beats-Friends

Conflicts:
	Beats Friends.xcodeproj/project.pbxproj