Working Views

There’s one error or warning but it compiles
Merge branch 'develop' of https://github.com/Barney-365-Fall-2104/FriendRadio

Conflicts:
	FriendRadio.xcodeproj/project.xcworkspace/xcshareddata/FriendRadio.xccheckout