Prepares for merge
Merge branch 'master' of https://github.com/khreenberg/my-champ.git
Prepares for merging
Merge branch 'master' of https://github.com/khreenberg/my-champ.git
Changes charset of StringInput
Merge branch 'master' of https://github.com/khreenberg/my-champ.git
Adds a few // TODO's
Merge branch 'master' of https://github.com/khreenberg/my-champ.git
Prepares for merging
Merge branch 'master' of https://github.com/khreenberg/my-champ.git
Weee errors!