てすと
テスト
test
Merge branch 'master' of https://github.com/DMTC-Team-A/test

Conflicts:
	rasbery.txt