deleted the comment
deleted the comment
done nothing
Merge branch 'master' of https://github.com/jhorowitz/QC_Map_It
Merge branch 'master' of https://github.com/jhorowitz/QC_Map_It
Added polylines for displaying path
Added polylines for displaying path
Integrated Luke's nodes with a few changes
Added a partially functional distance between coordinates measuring function
Merge branch 'master' into pr/4

Conflicts:
	app/src/main/java/com/example/josh/qcmapit/MapPane.java
Merge branch 'master' into pr/4

Conflicts:
	app/src/main/java/com/example/josh/qcmapit/MapPane.java
Added some stuff
Made it easier to add nodes
Made it easier to add nodes
MapPane now gets mainActivity on init
delete the comment
final connections
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/modules.xml