Something resembling a program with no syntax errors.
Merge branch 'master' of github.com:s-haines/Christmas
nearly there
Merge branch 'master' of github.com:s-haines/Christmas