updated seed file
updated some views
fixed yml merge
deleted nick's username from dbyml
updated index file
updated seed file
tony
's fixes
Merge branch 'master' of https://github.com/khalua/travlr
updated models and seed
updated db, models, and seed