index layout fixed, header fixed
Merge branch 'master' into hotfix/bootstrap-scaffolding
Merge branch 'master' of https://github.com/wilwong/csc309-v2