Added Email & Txt Messaging
Merge branch 'master' of https://github.com/CS2014/USM