creating conflict
Merge branch 'master' of github.com:pcaspen/july17

Conflicts:
	file2.txt
pushing file3.txt