update clubs
Merge branch 'master' of https://github.com/gcella/Hackathon-Fall-2014
ok
Merge branch 'master' of https://github.com/gcella/Hackathon-Fall-2014

k
working on clubs
Merge branch 'master' of https://github.com/gcella/Hackathon-Fall-2014
ok tom