all bars + inte
Merge branch 'master' of https://github.com/namlluks/VIP

Conflicts:
	app/views/shared/_navigation.html.erb