working on getting comments to display correctly
merging like crazy
Merge branch 'gregurton-master'
merging votes into questions
Merge branch 'master' of https://github.com/dheckman/question_box

Conflicts:
	config/routes.rb
	db/seeds.rb
Merge branch 'master' of https://github.com/dheckman/question_box

Conflicts:
	config/routes.rb
	db/seeds.rb