asdafgdhjk
Merge branch 'master' of github.com:KanColleTool/KanColleTool

Conflicts:
	.travis.yml