hackathon back-end
merging front from local to remote

Merge branch 'master' of https://github.com/marsella/clubhack