No more dolphins
Merge branch 'master' of https://github.com/githubteacher/uberconf