erg stuff
Merge branch 'master' of http://github.com/eswalker/cos333