updating notifications
Merge branch 'master' of https://github.com/doyunglee/OlinChallenge

Conflicts:
	.idea/workspace.xml
	src/main/java/com/evansimpson/mobpro/lab0/MainActivity.java
	src/main/java/com/evansimpson/mobpro/lab0/NotificationHandler.java