hello
Merge branch 'master' of https://github.com/beppo2k/hogehoge

Conflicts:
	src/main.c