took out float left on divs, still need to apply flex box model
Merge branch 'master' of https://github.com/awwong1/CMPUT410-Project into frontend
fixed merge conflict
fixed login and registration pages so the div resizes properly
Merge branch 'master' of https://github.com/awwong1/CMPUT410-Project into frontend
Merge branch 'frontend' of https://github.com/awwong1/CMPUT410-Project into frontend