Merge branch 'patch-1' of https://github.com/klgrimley/musicMusic into klgrimley-patch-1

Conflicts:
Final_Project/includes/main.css
Merge branch 'klgrimley-patch-1'
Merge https://github.com/Darthwack/musicMusic

Conflicts:
	Final_Project/includes/main.css