changes
Merge branch 'master' of https://github.com/dietricherwane/h-backward

Conflicts:
	log/development.log
changes