Cleaned up files
Merge pull request #2 from jared-schmidt/master

Version 2