Merge pull request #39 from blairprophett/master

merging steven's changes
Merge pull request #40 from blairprophett/master

deleted folder