Merge pull request #2 from mvjars/master

Pull request 1
minor change
Merge branch 'master' of https://github.com/timcroydon/forktest

Conflicts:
	test.txt
Merge pull request #1 from timcroydon/master

gimme