created users controller and model
Merge branch 'master' into rachelcalla_tuesday
added gemfile updates
weird gemfile
Merge branch 'rachelcalla_tuesday'
Merge branch 'master' of github.com:rmoshier/SeeMore-Salmon