Merge pull request #34 from gavinlaking/feature/twerks

Feature/twerks