added nicktrip,added user seed,changed db host
database.yml conflict
trying to merge yml problems