Added test file functionality
Resolved merge conflicts to alpha
Merge pull request #31 from lingow/testfile

Added test file functionality