it works
Correct merge conflicts with Joey 7 and master
Merge branch 'master' of https://github.com/draycox/hackday