0.001

Testing text file merge.
Merge pull request #7 from garvinling/master

Pull 1