moving some stuff around
idkMerge branch 'master' of github.com:logancollingwood/CMPS104