Signed-off-by: claire921 <claire921@gmail.com>


Signed-off-by: claire921 <claire921@gmail.com>


Signed-off-by: claire921 <claire921@gmail.com>
Merge remote-tracking branch 'origin/master'

Conflicts:
	Triplanner/gen/com/example/triplanner/R.java
	Triplanner/res/layout/showmap.xml
	Triplanner/res/layout/tripplan.xml
	Triplanner/src/com/example/triplanner/ShowMap.java