Add units
Merge branch 'master' of https://github.com/hirish/trolley

* 'master' of https://github.com/hirish/trolley:
  fixes ingredient list style

Conflicts:
	static/index.html
Stuff
Merge branch 'master' of https://github.com/hirish/trolley

* 'master' of https://github.com/hirish/trolley:
  changed ids