Add composer
COpy change
Merge branch 'master' of https://github.com/Intracto/SecretSanta
Merge branch 'master' of https://github.com/Intracto/SecretSanta

Conflicts:
	capistrano/deploy.rb