First commit
Initial commit
Merge https://github.com/jksilly/HealthCards
commit 10/09/13
Merge branch 'master' of https://github.com/jksilly/HealthCards

Conflicts:
	.classpath
	.project
	AndroidManifest.xml
	bin/AndroidManifest.xml
	bin/Healthcards.apk
	bin/classes.dex
	bin/classes/org/healthcards/CardView$1.class
	bin/classes/org/healthcards/CardView$2.class
	bin/classes/org/healthcards/CardView.class
	bin/classes/org/healthcards/R$id.class
	bin/classes/org/healthcards/R$layout.class
	bin/classes/org/healthcards/R$menu.class
	bin/classes/org/healthcards/R$string.class
	bin/classes/org/healthcards/main.class
	bin/dexedLibs/annotations-fca88be96f991dc8f99d3ee524001680.jar
	bin/dexedLibs/core-ac659ff5c3a9b3eb40db7935a38dc647.jar
	bin/dexedLibs/corexl2-a14165965c97aa3909fccffa288c7d2f.jar
	bin/resources.ap_
	gen/org/healthcards/R.java
	libs/corexl2.jar
	res/layout/view_card.xml
	src/org/healthcards/CardView.java
	src/org/healthcards/main.java
Merge branch 'master' of https://github.com/jksilly/health

Conflicts:
	README.md
Merge branch 'master' of https://github.com/jksilly/health

Conflicts:
	README.md