second conflict
Merge branch 'master' of https://github.com/marcv3/all_code

Conflicts:
	made a change.txt