dev
Merge branch 'master' of https://github.com/vickpto/bikes

Conflicts:
	log/development.log