CSS Changes2
Merge branch 'master' of https://github.com/maxjk/dominospotify

Conflicts:
	css/main.css
synch with css