mostly working feature
Merge branch 'master' of https://github.com/guts2014/Geeksoc