Navigation changes
Merge branch 'master' of https://github.com/kentcc/kelsi

Conflicts:
	assets/css/style.css
	assets/images/icons-sprite.png
	assets/images/icons-sprite.svg
	assets/images/sprites/kcc-logo.svg
	assets/images/sprites/kelsi-logo.svg