inc
Merge branch 'master' of github.com:embeddedbender/try_git

Conflicts:
	foo.txt