added seed for users and flats
Resolved conflicts
Merge pull request #3 from deuxio/users-and-flats-seed

added seed for users and flats
conflit gemfil
Resolved conflicts