pre pull
Merge branch 'master' of github.com:mattmarcello/class_proto
deleted junk again
clean up
clean up conflicts
Merge branch 'master' of github.com:mattmarcello/class_proto
Merge branch 'master' of github.com:mattmarcello/class_proto