Added main menu
Resolved merge conflict
Fixed assets
Merge branch 'GijsMainMenu'
Merged master into my branch