Merge branch 'test' of https://github.com/iwbjp/gitbootcamp into test

Conflicts:
	test.txt
fast
Merge branch 'test'

Conflicts:
	test.txt