Insert from origin.
Merge branch 'master' of github.com:ffmatsu/test

Conflicts:
	main.c