changed the production.rb file to reflect changes for porduction
migrated a new file to update changes for devise
Merge branch 'master' of https://github.com/LiaKitamura/Glass-Over-Flowing

Conflicts:
	db/schema.rb