bye backbone
Merge branch 'master' of https://github.com/jaywhiletwo/stockpot

Conflicts:
	static/index.html
	static/stockpot.js