Added controller and gender select
Merge branch 'add-a-controller' into gh-pages