added line
Merge branch 'master' of https://github.com/eme47/myfirstgit2
merged conflict between added line and something else
Conflicts:
	draft.txt
changed table2