Had to change line
Merge branch 'master' of https://github.com/wai1/myfirstgit

Conflicts:
	draft.txt