conflict resolution part 2

oh noes, collisions!
conflict resolution button has been pressed
Merge branch 'master' of https://github.com/XepherX/SMURT

Conflicts:
	swg/sweh.java