init
Merge branch 'master' of https://github.com/CIT597Project/backup

Conflicts:
	config/initializers/database.rb