commented out DanKaminksy.pde
brought old Apat into new code
Merge branch 'master' of https://github.com/sugarcubes/SugarCubes
deleted weird remnants of merge but still broken
Merge branch 'master' into newmaster
finally got master working