Deleted a .swp
Merge branch 'master' of github.com:Corly/SecretSanta