merge conflict
fixing merge issues
fix
Merge branch 'dev' of https://github.com/sancar1/CEN3031 into dev

alfalfjdalf
 Please enter a commit message to explain why this merge is necessary,

this sucks
Merge branch 'dev' of https://github.com/sancar1/CEN3031 into dev

udate# the commit.
Merge branch 'dev' of https://github.com/sancar1/CEN3031 into dev

merge# especially if it merges an updated upstream into a topic branch.