try to fix
Merge branch 'Features----MM&RS' into Development

Conflicts:
	Questionaire_App/Questionaire_App/MainMenuViewController.h
	Questionaire_App/Questionaire_App/MainMenuViewController.m
	Questionaire_App/Questionaire_App/MainStoryboard.storyboard
	Questionaire_App/Questionaire_App/RecordSongViewController.h
	Questionaire_App/Questionaire_App/RecordSongViewController.m
	Questionaire_App/Questionaire_App/SongLibraryViewController.h
	Questionaire_App/Questionaire_App/SongLibraryViewController.m