oops. forgot to add new files
Merge pull request #1 from ccarterc/dev

oops. forgot to add new files