pull
Merge branch 'master' of https://github.com/lynneokada/Reddit-on-Rails

Conflicts:
	app/models/user.rb
Merge branch 'master' of https://github.com/lynneokada/Reddit-on-Rails
resources :user added to routes.rb, some tests in user_test created
Merge branch 'master' of https://github.com/lynneokada/Reddit-on-Rails

Conflicts:
	app/models/user.rb
	test/models/user_test.rb