Merge branch 'develop' of https://github.com/Barney-365-Fall-2104/FriendRadioNew into develop

Conflicts:
	FriendRadioNew/ViewController.swift