old
Merge branch 'master' of https://github.com/mpangoni/poker-advisor

Conflicts:
	lib/poker-advisor/models/player.rb
Working now