first Commit
てｓｔ
ああ
てすとです」
Merge branch 'master' of https://jetcity.backlog.jp/git/JBCA/jetcity

Conflicts:
	sample.txt
test
test2
test3
Merge remote-tracking branch 'github/master'