minor change
minor css change
changes
Merge branch 'master' of https://github.com/Kuiteland/Journalistiek-app

Conflicts:
	app/assets/stylesheets/custom.css.scss