Merge pull request #30 from gavinlaking/feature/twerks

Feature/twerks