11
Merge branch 'master' of https://github.com/laoyaosniper/sigpoker

Conflicts:
	java/Contest2013/src/com/barracuda/contest2013/ContestBot.java