View Committ
Merge branch 'master' of https://github.com/JohnRuller/Music-Project

Conflicts:
	Music Project/MainStoryboard.storyboard