#49 mostly done.
Merge branch 'master' of https://github.com/OOKB/grad-show-2015