Kori's file
Merge pull request #7 from korinewman/master

Kori's file