Set test's database.yml
Merge branch 'master' of https://github.com/HotShot5566/TryBootstrap

Conflicts:
	config/database.yml