Test
Merge branch 'master' of https://github.com/vanNiewoehner/talentwuerfel-js

Conflicts:
	public/stylesheets/style.css