closes #2
Merge branch '#2-mainmenu'