Testing merging
Merge branch 'master' of https://github.com/dpatz/try_git

Conflicts:
	README.txt