Bakabaka-
Merge branch 'master' of https://github.com/asakasa/GitHubTest.git
AHAn
Merge branch 'master' of https://github.com/asakasa/GitHubTest.git

Conflicts:
	test.c