Add choice functionality
Merge pull request #4 from danarch/front

Add choice functionality
Merge branch 'master' into rails