Adding notifications to Activities Fragment
Merge branch 'master' of https://github.com/gerardino/spacecoatl

Conflicts:
	app/src/main/java/com/example/spacecoatl/app/Notification.java