Now loading history and rendering
Merge branch 'master' of https://github.com/hirish/trolley

# By Fred Kelly
# Via Fred Kelly
* 'master' of https://github.com/hirish/trolley:
  rebinds carousel on search
  adds *.js to .gitignore

Conflicts:
	static/js/trolley.js
Merge branch 'master' of https://github.com/hirish/trolley

# By Fred Kelly
# Via Fred Kelly
* 'master' of https://github.com/hirish/trolley:
  attempts to fix .gitignore
Added url to recipe object and changed imageURL to imageUrl to be standard