changed mysql2 database.yml
fix
Merge remote-tracking branch 'origin/master'

Conflicts:
	Gemfile.lock
changed mysql2 database.yml