Merge pull request #1 from tdotbone/master

Merging files