commit to pull new code
add .idea file in gitignore
conflict resolved
remove_syntex_problem_from_migration
syntex_problem_of_migration_resolved
migrations fixed
migrations fixed - deleted migration removed
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