dev commit for pull
Merge branch 'stripe_master' of github.com:electricgraffitti/castle into stripe_master
Merge branch 'stripe_master' of github.com:electricgraffitti/castle into stripe_master

Conflicts:
	Gemfile.lock