commit
Merge branch 'master' of github.com:ylwu/take-my-pills
commit
Merge branch 'master' of github.com:ylwu/take-my-pills

Conflicts:
	src/main.js
Merge branch 'master' of github.com:ylwu/take-my-pills