Changed something
Merge branch 'master' of https://github.com/rpickard/try_git.git

Conflicts:
	change.txt