Working on AI while syncing with phelan
sync AI
Merge branch 'dev' of github.com:the-hobbes/softwareEngineeringProject1 into dev
sync
Merge branch 'dev' of github.com:the-hobbes/softwareEngineeringProject1 into dev