Fixed a bug. Or, er, hacked at it. It's dead now. I think.
Merge branch 'master' of https://github.com/guts2014/Geeksoc