clean up and re-arranging

* important, there's a loading problem with refreshing the page and page not loading, i think it has to do with the music player, maybe have the music play only load a song when there was a click to play a song rather than do a pre-load? (if that is how it works)
Merge branch 'master' of https://github.com/jrods/comp199

Conflicts:
fixed: index.php