last moment cheap responsive
Merge branch 'master' of https://github.com/danielravina/comp_1950_project
resolve conflict