Integrate filter phase II
Add shuffle button
Merge branch 'master' of https://github.com/ericluong/voila