update
update
update

update
update
Merge branch 'master' of https://github.com/sd7232126/GourmetFuel

Conflicts:
	public/js/controllers.js
delete
delete
Merge branch 'master' of https://github.com/sd7232126/GourmetFuel

Conflicts:
	public/Templates/template.dwt