Prepares for merge with new .gitignore
Merge branch 'master' of https://github.com/khreenberg/my-champ.git
Changes the name of a few final fields to uppercase