new local
Merge branch 'master' of https://github.com/ericcj24/bchart4

Conflicts:
	.classpath
	AndroidManifest.xml