fixed color bug, intel potentially functional
probably returning intel functoinal
Merge pull request #3 from davelkan/david

David
Merge branch 'master' into nodestats

Conflicts:
	app/src/main/java/com/example/davelkan/mapv2/MapsActivity.java