added votes feature
merged with upstream master
added user profile show page
search engine functioning
Merge branch 'tjblonsk-master'

Conflicts:
	app/controllers/users_controller.rb