again trying merge tool
Merge branch 'master' of https://github.com/maggiechen/santa-inc