Soldiers Pack, Skeleton Pack, Stone
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore