formatting issues
Merge branch 'master' of github.com:fisher/poker_lib

Conflicts:
	LICENSE