things changed
Fixing the conflict. Merge branch 'master' of https://github.com/dbouquin/myfirstgit

Conflicts:
	nextfile.txt
adding .dat file