add caristrano
update capistrano configs
Merge branch 'master' of https://github.com/Design-Collective/myteevee2.0 into ft/user-sign-up-72499862

Conflicts:
	Gemfile.lock
	db/schema.rb