pulling
Merge branch 'master' of https://github.com/Edeleon4/CranberryGlass

Conflicts:
	bin/CranberryGlass.apk
	bin/classes.dex
	bin/classes/com/example/cranberry_glass/CranberryMenuActivity.class
	bin/classes/com/example/cranberry_glass/GraphRenderer.class

bin/classes/com/example/cranberry_glass/GraphService$CompassBinder.class
	bin/classes/com/example/cranberry_glass/GraphService.class
	bin/classes/com/example/cranberry_glass/R$dimen.class
	bin/classes/com/example/cranberry_glass/R$drawable.class
	bin/classes/com/example/cranberry_glass/R$id.class
	bin/classes/com/example/cranberry_glass/R$layout.class
	bin/classes/com/example/cranberry_glass/R$menu.class
	bin/classes/com/example/cranberry_glass/R$string.class
	bin/classes/com/example/cranberry_glass/R$style.class
	bin/classes/com/example/cranberry_glass/R$xml.class
	bin/classes/com/example/cranberry_glass/TwoDimenPlotActivity.class
	bin/dexedLibs/android-support-v4-aa5fd5c53bd383d86d25d79a13b74d35.jar

bin/dexedLibs/androidplot-core-0.6.0-b92311f3329e7f85b9de18746a316629.ja
r
	bin/resources.ap_
	gen/com/example/cranberry_glass/R.java