added shuffle
Merge branch 'master' of https://github.com/tingled/cmj-api