pulling from upstream.
Fixed merge conflicts after pulling from upstream.
Got rig of unused css links in index.html.
Merge pull request #9 from CollinBlinder/maintanence

Maintanence