removed toms stuff
Merge branch 'master' of github.com:himerzi/addle
cleaned up toms stuff