Syncing changes
Merge branch 'ImageCache' of https://github.com/Barney-365-Fall-2104/Beats-Friends into ImageCache

Conflicts:
	Beats Friends/BeatsSearchController.swift