notifications working
notifications working
Merge branch 'master' of https://github.com/shadibarhoumi/FeedYourNetwork into brian

Conflicts:
	FeedYourNetwork.js