Delete AttributeManager.java.orig
Merge pull request #43 from jrec15/master

Merge pull request #13 from dawgtrades/master
Merge pull request #14 from dawgtrades/master

fix conflict