Justice's Commit

//testing
Merge branch 'master' of https://github.com/EmailAppHackPrinceton/HackPrinceton
Justice's Commit

Justice's Comment
Merge branch 'master' of https://github.com/EmailAppHackPrinceton/HackPrinceton