Local changes made.
Merge branch 'master' of https://github.com/slerer/demo

* 'master' of https://github.com/slerer/demo:
  Remote changes made.

Conflicts:
	myfile.txt

fixed conflict