wysiwyg
Merge branch 'master' of https://github.com/jetsekoopmans/brilliance

Conflicts:
	app/views/layouts/_navigation_links.html.erb