First Commit
Merge branch 'master' of github.com:devjunkORG/sc2

Conflicts:
	.gitignore
Fixed .gitignore
.
Merge branch 'master' of github.com:devjunkORG/sc2

Conflicts:
	.gitignore