Small Change
Merge branch 'master' of github.com:cmusv-fse/SSNOC-SB8-Frontend
Public wall in progress
Fixed merge conflict