A random change of 12865 to conflict1.txt
A random change of 20048 to conflict2.txt
A random change of 20951 to conflict3.txt
A random change of 9968 to conflict1.txt
A random change of 30498 to conflict2.txt
A random change of 3936 to conflict3.txt
Merge branch 'master' into rereretest2

Conflicts:
	conflict1.txt
	conflict2.txt
	conflict3.txt
Feature work
Merge branch 'master' of https://github.com/githubtraining/hellogitworld