Notification Service
Terrible commit message, but stuff
Merge branch 'master' of https://github.com/corile/Hackathon
Reset files to pre modification state