store/index @flat_conveniences corrected
Merge branch 'master' of https://github.com/nikneroz/bab

Conflicts:
	log/development.log
	tmp/pids/server.pid