Merging with latest changes
Merge branch 'master' of github.com:rzhou186/dotheharlemshake
Fixed minor JS bug