init.  made search partial and added to root path
implemented search on posts/index erb page
made text for comments and posts customized to make sense in the display
added an admin test for user name
tests added for validation of email on signup
added test for password validation
Merge remote-tracking branch 'origin/development' into search_story

Conflicts:
	app/controllers/categories_controller.rb
added admin controller test - you need to have set a session valid before creation
added logout route to admins
Merge pull request #11 from zahidkarim/admin-feature-branch

Admin feature branch
have it redirecting to the correct page after you make a post
added feature test to test search functionality under spec/features/search_spec
got the comments showing as sorted by votes in desc order
added user tests. edited associations in user model
Merge pull request #12 from zahidkarim/2nd-ranked-nested-comments-user-story

2nd ranked nested comments user story
Merge pull request #10 from zahidkarim/search_story

Search story
Merge remote-tracking branch 'origin/development' into user_story

Conflicts:
	app/models/user.rb
Merge pull request #13 from zahidkarim/user_story

added user tests. edited associations in user model
Merge remote-tracking branch 'origin/development' into voter-user-stories3

Conflicts:
	spec/controllers/users_controller_spec.rb
	spec/factories.rb