notification any time
notification anytime 2
Merge branch 'master' of https://github.com/YGLiu/RunMyWay

Conflicts:
	src/com/example/runningman/GoogleLogin.java
	src/com/example/runningman/Sensor.java
Merge branch 'master' of https://github.com/YGLiu/RunMyWay

Conflicts:
	src/com/example/runningman/Sensor.java