new branch?
Merge branch 'master' of https://github.com/elparkino/money-pills

Conflicts:
	js/main.js
fine, git, I fixed it