this is by pramod
Merge branch 'master' of github.com:pramodshinde/joshforum
this is commit by pramod
Conflicts:
	Gemfile