closes #4
closes #3
Merge branch 'master' of https://github.com/fuerchter/22Jams02