creating fun conflicts with Danielle
Merge branch 'master' of github.com:pcaspen/july17

Conflicts:
	file3.txt
getting changes
Merge branch 'master' of github.com:pcaspen/july17
conflict
Merge branch 'master' of github.com:pcaspen/july17

Conflicts:
	file1.txt