more lines for testing github conflicts
Merge branch 'master' of https://github.com/hautahikingi/myfirstgit

Resolved a conflict between two sentences.
Conflicts:
	draft.txt