lñklñkl
Merge branch 'master' of http://github.com/ingrenee/cupon

Conflicts:
	app/logs/dev.log