changes to foo
Merge branch 'master' into new_stuff

Conflicts:
	foo.html