Merge pull request #21 from thisispayal/gh-pages

I hope I didn't delete the uses with this merge.
Merge pull request #23 from thisispayal/gh-pages

Commits hopefully resolved the merge issues.
Cleaning up CSS
Anchor link scroll no longer pushes inbetween states
merged changes from vigilant
think I fixed all of the merge conflicts
Merge pull request #24 from DSegal92/gh-pages

Working on CSS cleanup/ fixing merge conflicts
Merge pull request #9 from vigilant/gh-pages

Fixed up project