dont mind me just trying to figure out how to merge in git
Merge branch 'master' into homework
wiped
come on