Navigation work - ongoing
Merge branch 'master' of https://github.com/kentcc/kelsi

Conflicts:
	assets/css/style.css