Test commit. Added pry and twitter bootstrap rails
Added twitter bootstrap UI, devise, cancan and rolify
Removed binding.pry call from registrations controller
Allow users to add other users
Paperclip for avatar uploading
Added mailcatcher and devise confirmable module
Subdomain and token authenticable
Added omniauth-facebook gem
Sign up with facebook
Save facebook auth for existing user
Sign up with google
Fixed registration issues
Removed owner relationship
Merge branch 'master' into omniauth

Conflicts:
	Gemfile.lock
	app/controllers/users/registrations_controller.rb
	app/models/user.rb
Adding and removing of external authentications from user show page
Enabled subdomain
Hash syntax change
Basic stripe setup
Allow user to set password when confirming user
Minor code changes