Added updated project plan
Merge remote-tracking branch 'origin/master' into gui-sprint3