Add,Update, and Delete Subscription functionality
Add,Update, and Delete Subscription functionality
Updated Subscrption.rb
Merge branch 'Issue_5' into development

Conflicts:
	app/controllers/subscriptions_controller.rb