Updated server IP
Merge branch 'master' of github.com:eebs/ebot

Conflicts:
	leaves/tf2/controller.rb