test3
Merge branch 'develop' of https://github.com/tatsuyanarita/playaround into develop

Conflicts:
	src/test.txt