resolve duplicates
resolve conflicts
Merge branch 'master' of github.com:mattmarcello/class_proto