yay! no goofy editor
Merge branch 'master' of https://github.com/att14/starcraft

Conflicts:
	poop.txt