okay, last idiotic mistake by me for today (in regards to the nav)
Merge branch 'master' of https://github.com/OOKB/grad-show-2015