Add Map!
fix conflict
Merge branch 'master' of https://github.com/carolqian/Task13

Conflicts:
	Triplanner/gen/com/example/triplanner/R.java