change things on website
Merge branch 'dev' of github.com:lukasleitsch/Showmator into dev

Conflicts:
	sass/website/styles.scss
	website/css/styles.css