getting somewhere
Merge branch 'master' of

Conflicts:
	mentex/config/navigation.rb