Layout improvements
Merge branch 'master' of https://github.com/RinkeHoekstra/research-story

Conflicts:
	src/app/static/css/style.css
	src/app/static/js/main.js
	src/app/views.py