Created test db with pseudo-userlist to test /users/
Merge branch 'updating-users' of github.com:jakenotjacob/sample_app into updating-users

Conflicts:
	app/views/users/edit.html.erb

:wq	:q