Adding c
Merge remote-tracking branch 'remotes/origin/master' into c

Conflicts:
	foo.txt
Merge remote-tracking branch 'remotes/origin/c'