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

Conflicts:
	src/layout_jason.css