Updated Subscription Methods and Spec Model
Updated Subscription Methods and Spec Model
Issue #50 - Documentation update and added flash to admin home page.
Issue #51 - Add initial travis ci configuration file.
Issue #51 - Updated specs and keys
Issue #51 - Set to pending the subscription controller tests for now.
Issue #51 - Add email notification for Travis builds
Issue #54 - Initial feature test
Issue #54 - Added additional feature tests for signing up.
Merge pull request #55 from alim/Issue_54_Feature_Tests

Issue 54 feature tests
Updated Subscription Methods and Spec Model
Added Create Plans and Coupon
Issue #5 - Updated GEM file to include pry
Issue #5 - Updated Gemfile.lock after latest bundle install
Merge branch 'development' into Issue_5

Conflicts:
	Gemfile
	Gemfile.lock
	app/models/subscription.rb
	spec/models/subscription_spec.rb
Merge pull request #59 from alim/Issue_5

Issue 5 - Merge into Development Branch
Issue #58 - Fixed User#show view to properly show the groups as labels.
Merge pull request #60 from alim/Issue_58

Issue #58 - Fixed User#show view to properly show the groups as labels.
Merge branch 'master' into development
Merge branch 'development' of git@github.com:alim/ignition.git into development