settings
Merge branch 'master' of https://github.com/kimmanis/deals

Conflicts:
	log/development.log
fixed #6