assets
Merge branch 'master' of github.com:pramodshinde/joshforum
remove confilcts of assets
Conflicts:
	app/models/asset.rb
category added properly
Merge branch 'master' of github.com:pramodshinde/joshforum