fixed scroll in mobile;
Merge branch 'develop' of https://github.com/csc309-proj/project into develop