done with messaging
Merge branch 'master' of https://github.com/TalAcademic/FinalProject