Adds navigation sass and jade include files
Merge remote-tracking branch 'origin/master'

Conflicts:
	assets/css/style.min.css