get.txt from remote
file
Merge branch 'master' of https://github.com/hovetaut/RPB into inprogress

Conflicts:
	git.txt
comment on merge wording
file

Conflicts:
	git.txt