use database.example.yml
Connect to mysql
Merge branch 'master' of github.com:9-volt/bloodbase

Conflicts:
	Gemfile