inbox changes
Merge branch 'master' of https://github.com/TeamDionysus/End-to-end-JS-Apps-Teamwork