testing user model
Merge branch 'master' into user-tests
user models tests pass, working on user controller
Merge branch 'master' into user-tests

Conflicts:
	db/schema.rb
	spec/features/topic_spec.rb
Merge pull request #13 from gopher-snakes-2013/user-tests

user model and controller and tests