Merge branch 'master' of github.com:Kerrick/donate-stl

Conflicts:
	app/controllers/application.js
	app/controllers/search.js
	app/templates/application.hbs