Adjusting CSS
Merge branch 'master' of https://github.com/wwchen/sw-matcha

Conflicts:
	public/index.html