Swagegegegege
Merge remote-tracking branch 'origin/master'

Conflicts:
	basewars/src/me/tg/bw/Commands.java