Merge branch
Merge branch 'master' of http://github.com/appcrews/happy-dual-holiday