closes #9
Merge branch '#9-mainMenu'