change
Merge branch 'master' into new-feature

Conflicts:
	foo.c
Merge branch 'new-feature' of https://github.com/IanGHackIn/GoWithGit into new-feature