commit everything
Merge pull request #1 from cmacn024/EricTestBranch

commit everything