init
Merge branch 'master' of github.com:rafaelbbraz/motohora

Conflicts:
	Gemfile
	Gemfile.lock
	config/database.yml