Merge branch 'master' into feature/navmenu
Merge branch 'feature/navmenu' of https://github.com/wilwong/csc309-v2 into feature/navmenu
menu items, unstable