added notification
added notification sound
fixing conflicts
git push origin master
Merge branch 'aido179-master'