hello
Merge branch 'master' of https://github.com/SafeWalk/SafeWalk

Conflicts:
	.idea/workspace.xml
This is kohei trying to pull stuff
Merge branch 'master' of https://github.com/SafeWalk/SafeWalk

Conflicts:
	.idea/workspace.xml
	out/production/SafeWalk/SafeWalk.apk
	out/production/SafeWalk/SafeWalk.unaligned.apk
	out/production/SafeWalk/com/mac/SafeWalk/MainClass$1.class
	out/production/SafeWalk/com/mac/SafeWalk/MainClass.class
	out/production/SafeWalk/com/mac/SafeWalk/SendMessageToSafeWalk.class