stuff
Merge branch 'master' of github.com:T4All/EggJog