updated
Merge branch 'master' of github.com:supersean/go_club_app