Added more CR comments and removed some which were fixed
Merge branch 'master' of github.com:divyatalwar/rails-project

Conflicts:
	app/models/upload.rb