deleted user name and reis for heroku push
Merge branch 'master' of https://github.com/tkwidmer/saferstalls_rails

Conflicts:
	config/database.yml