local commit
Merge branch 'master' of https://github.com/nitinzd/brails

Conflicts:
	Gemfile.lock
	config/initializers/rails_admin.rb
	spec/controllers/users_controller_spec.rb
Added env/devlopment.rb
resolve the conflict.
first commit :nominate,topic error message
astrik problem solved,message displayed
Merge pull request #25 from arkiver/master

Fixing some typos in Readme
Passing rspec for topics controller
Removed conotroller question and contents
Merge branch 'master' of github.com:SpiderGears/gitBrails into SpiderGears-master
Merge pull request #26 from SpiderGears/master

Removed Questions and Contents Controller
Added gem database_cleaner
Trying to integrate accessible calendar
Resolve the conflict in topics_controller_spec file.
Remove Controller Questions and Contents, dropped content_type validation
Modified the count field to increase_count in attempt model.
Have implemented social network sharingg and working well
Merge branch 'master' of https://github.com/SpiderGears/gitBrails
Content Model validations passed
Merge branch 'master' of github.com:nitinzd/brails