Merge pull request #27 from ErinBuckley/master

files moved