Merge branch 'master' of github.com:SpiderGears/gitBrails into SpiderGears-master
added gem spork-rails and guard-rspec
Merge branch 'master' of https://github.com/nitinzd/brails
Changes to Guardfile and spec_helper
changed fields on profile page| changes in _nominate form
Changes to topic and content model Resolved Issue #37
Questions belongs Topic and Content :All working
Added before save filter to Question
Changes to Content and Topic model, added Order clause
Cookies changed to coins, modified factories, All spec passing
Merge branch 'master' of github.com:SpiderGears/gitBrails into SpiderGears-master
Merge branch 'SpiderGears-master'

Conflicts:
	Gemfile.lock
basic changes
basic changes
modified topic ontroller specs and Question factory