Merge pull request #70 from Caesarofthesky/master

Lots of changes
fixes local scroll animation problems
resolved index conflict
adds styles for tour popup
changed styles of tour popup
fixed li order on main nav
fixes bug with switching pages when popup is active
Merge pull request #72 from vingiarrusso/feature

Feature
changes nav bar and titles
removed footer and changed text
content to guide adjusted