local
Merge remote-tracking branch 'Cody/master'
comit
Merge branch 'master' of git@github.com:maloney626/SoftwareEngineeringProject.git
managed to merge with cody
fixed switching
Merge remote-tracking branch 'Joey/master'