etst
Merge branch 'master' of https://github.com/waynewgl/guessEat_backend

Conflicts:
	config/database.yml
	log/development.log
testing