commited the change
Merge branch 'master' of https://github.com/kmy0ra/default_repo

Conflicts:
	foo.c