basic stage done
Merge branch 'master' of github.com:higgins/SuperHappyGifKaraokeTime