Merge pull request #1 from bazaarvoice/master

Merge latest
add unfair shuffle
Merge pull request #11 from robbytx/master

add unfair shuffle puzzle