ok
Merge branch 'master' of https://github.com/biaccioly/corgi-day

Conflicts:
	log/development.log