separated users_seeds from seeds.rb
fixed merge errors
Merge pull request #10 from Adrian-Pask/justin-tyler2

Justin tyler2