layout & compass
Merge branch 'master' of github.com:yu-chan-m/town

Conflicts:
	src/com/example/calculateway/MainActivity.java