first commit
Merge https://github.com/bzfisher/codejam--