conflict resolved
Merge branch 'master' of github.com:usmanasif/Coding-Queue into umar

Conflicts:
	.idea/workspace.xml
	Gemfile
	db/migrate/20121019072637_remove_column_count_votes.rb
	db/schema.rb
	log/searchd.development.pid