interface work
Merge branch 'master' of https://github.com/lookitscook/price-of-humanity

Conflicts:
	js/main.js
Merge branch 'master' of https://github.com/lookitscook/price-of-humanity