Fixed nav issues
Merge branch 'master' into ryan
Merge branch 'ryan'
Even more links
merging adam into master

Conflicts:
	index.html
Fixed firefox header bug