added mobile diff
Merge branch 'master' into feature/navmenu
better panels
Merge branch 'master' into feature/navmenu
Merge branch 'master' into feature/navmenu
minor css fix
Merge branch 'hotfix/bootstrap-scaffolding' of https://github.com/wilwong/csc309-v2 into hotfix/bootstrap-scaffolding