CHF Info included.
CHF Info included
CHF Info included
Merge remote-tracking branch 'origin/master'

Conflicts:
	AndroidManifest.xml
	bin/AndroidManifest.xml
	bin/classes/edu/usf/csee/heartbooth/R$string.class
	bin/classes/edu/usf/csee/heartbooth/R$style.class
	bin/classes/edu/usf/csee/heartbooth/gui/DatePickerFragment.class
	gen/edu/usf/csee/heartbooth/R.java
	res/values/strings.xml