Better (?) design
Update README.md
Merge remote-tracking branch 'github/master'

Conflicts:
	src/main/resources/static/css/style.css