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

...lgrimley-patch-1

Conflicts:
Final_Project/includes/main.css