diagrams changed i guess?
Merge branch 'master' of https://github.com/namoscato/cs1573-team-project
title slide