alpha : style page
Merge branch 'master' of https://github.com/adrienbecker/gomotoro_v3

Conflicts:
	.meteor/.id