log
Merge branch 'master' of https://github.com/ezesubu/book

Conflicts:
	log/development.log