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

Conflicts:
	public/js/app.js