Updated hoge to hgoehgooehohgeohe
Merge branch 'master' of https://github.com/pixikawa/test

Conflicts:
	hoge