remote db uppe
Merge branch 'master' of github.com:GrayOverride/McMocup
Merge branch 'master' of https://github.com/GrayOverride/McMocup
Merge branch 'master' of https://github.com/GrayOverride/McMocup

Conflicts:
	config/database.yml