Adding login button
Merge branch 'master' of https://github.com/wwchen/sw-matcha

Conflicts:
	public/index.html
	public/matcha/css/matcha-style.css
Merge branch 'master' of https://github.com/wwchen/sw-matcha

Conflicts:
	public/index.html
	public/matcha/css/matcha-style.css