added myself again because someone had the gall to remove me from the list
Merge branch 'master' of github.com:mattmarcello/class_proto