Merge pull request #32 from gavinlaking/feature/twerks

Feature/twerks