Merge pull request #6 from dcgudeman/master

Users Controller: viewing all users, viewing specific user and editing user fields working
added more seed data
Merge branch 'master' of https://github.com/ikitha/Project_2
added tmp folder to .gitignore