adding maps
adding maps again
Merge branch 'master' of https://github.com/drewvance/ShowgoApphack

Conflicts:
	bin/R.txt
	bin/classes/com/example/showgoapphack/Lineup.class
	bin/classes/com/example/showgoapphack/R$id.class
	bin/classes/com/example/showgoapphack/R$layout.class
	bin/classes/com/example/showgoapphack/R$menu.class
	bin/classes/com/example/showgoapphack/R$string.class
	bin/classes/com/example/showgoapphack/R$style.class
	gen/com/example/showgoapphack/R.java
	res/layout/activity_map.xml
	src/com/example/showgoapphack/Map.java