first commit :nominate,topic error message
astrik problem solved,message displayed
Merge branch 'master' of github.com:SpiderGears/gitBrails into SpiderGears-master
Conflict resolved
Merge branch 'master' of github.com:nitinzd/brails
Resolve the issue for bcrypt-ruby gem.
bonus round
bonus round
Merge branch 'master' of github.com:SpiderGears/gitBrails into SpiderGears-master
Merge branch 'SpiderGears-master'

Conflicts:
	Gemfile.lock
basic changes
Modified the admin layout file, also modified the header file.
Merge branch 'master' of github.com:nitinzd/brails
basic changes
modified topic ontroller specs and Question factory
Calender image is aligned
modified rspec and question factory
Merge branch 'master' of github.com:seemajha/brails into seemajha-master

Conflicts:
	app/views/users/_frmprofile.html.haml
Resolve the conflict for user profile form and topic form.
Merge branch 'master' of github.com:nitinzd/brails