Eclipse built-in git is terrible
Merge branch 'master' of https://github.com/ssabpisa/isocomm

Conflicts:
	bin/classes.dex
	bin/classes/com/google/android/gms/R$color.class
	bin/classes/com/google/android/gms/R$id.class
	bin/classes/edu/purdue/isocomm/Map.class
	bin/classes/edu/purdue/isocomm/R$color.class
	bin/classes/edu/purdue/isocomm/R$id.class
	bin/classes/edu/purdue/isocomm/R$string.class
	bin/classes/org/isoblue/isoblue/R$string.class