fix navigation bug and remove wil nichols

Signed-off-by: scottsavarie@gmail.com <158brunnenstrasse>
Merge branch 'refs/heads/master' into shuzzle

Signed-off-by: Scott Savarie <scottsavarie@gmail.com>

Conflicts:
	.sass-cache/45ecefd212cbce587dbcc3b5402fd48798d2177a/navigation.sassc
	css/main.css
	index.html