Removed random4.txt, updated random3.txt
conflict merged
Merge branch 'master' of github.com:tiemevanveen/GitMergeTest