Merge branch 'master' of https://github.com/Patrickmnts/28hugs into Patrickmnts-master

Conflicts:
	app/models/subscriber.rb
	db/development.sqlite3 (double check this if issue)

	merge patricks work on signin/authentication

	deleted conflict in app/models/subscriber - it was some un-needed test logic from joe around customer creation in stripe
update
Merge branch 'update'