a
Merge branch 'master' of https://github.com/kcoolsoo/cs442group6

Conflicts:
	RunningAssistant/bin/RunningAssistant.apk
	RunningAssistant/bin/resources.ap_