Added flash function
Merge branch 'master' of https://github.com/hirish/trolley
Horrid

# By Fred Kelly (3) and Barney Jackson (2)
# Via Fred Kelly (3) and Barney Jackson (2)
* 'master' of https://github.com/hirish/trolley:
  fixed tap bug on carousel
  Ingrdients returned
  adds id printing to import script
  adds date picker to order form
  Eatlists

Conflicts:
	static/css/application.css
	static/js/trolley.coffee
	static/js/trolley.js
Fixed flash from broken merge (sorry)