changes
Merge branch 'master' of https://github.com/bluquar/substance_tracker

Conflicts:
	web/static/style.css