add user tests
Merge pull request #3 from sotoseattle/master

add user tests
Merge branch 'master' of https://github.com/bozcotty/artcaring3.2 into test

Conflicts:
	.DS_Store
	test/fixtures/users.yml
	test/test_helper.rb