added choice model
Merge branch 'master' of https://github.com/btelintelo/campjoy