Handle conflict
Merge branch 'master' of https://github.com/swedwise/pulltest

Conflicts:
	README.md
	pull2_file.txt