a lot of stuff
Merge branch 'master' of https://github.com/lctyler/309
Doin lots stuff
mergeing
redo
...