T
Merge branch 'master' of
ssh://git@github.com/JacketCraft/JacketCraft.git

Conflicts:
	.gitignore