bonus round new changes
Merge branch 'master' of github.com:nitinzd/brails

Conflicts:
	app/controllers/topics_controller.rb