name change
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
moved files to proper locations. no content changes.
Merge pull request #27 from ErinBuckley/master

files moved