History handlers
Merge branch 'master' of https://github.com/hirish/trolley

# By Barney Jackson (1) and Fred Kelly (1)
# Via Barney Jackson
* 'master' of https://github.com/hirish/trolley:
  Added test directory and ignored it
  finished toggle functionality for servings selector

Conflicts:
	static/js/trolley.js