update style
Merge branch 'develop' of github.com:TEDxTaipei/Timer into develop

Conflicts:
	js/app.js