I added a 3rd line in draft
Merge branch 'master' of https://github.com/njian/myfirstgit

decided to fix conflict

Conflicts:
	draft.txt
fixed bug