added menu
added controls to menu
fixed merge conflicts
Merge pull request #6 from jamienf/jf-menu-page

Jf menu page