merge
Merge branch 'master' of github.com:maxko87/pokerbots

Conflicts:
	javabot/config.txt
	javabot/opponent/pokerbot.jar
	javabot/opponent/src/pokerbots/brains/EVBrain.java
	javabot/opponent/src/pokerbots/regression/PlanarModel.java
	javabot/opponent/src/pokerbots/strategy/BettingStrategy.java
	javabot/opponent/src/pokerbots/utils/StatAggregator.java
	javabot/opponent/src/pokerots/strategy/BettingStrategy.java
	javabot/pokerbot.jar
	javabot/src/pokerbots/strategy/BettingStrategy.java
	javabot/src/pokerots/strategy/BettingStrategy.java