Jesus time
Jesus -Time Class
Jesus Changes
Merge branch 'master' of https://github.com/seth-skocelas/PHMS

Conflicts:
	.metadata/.log
	.metadata/.plugins/com.android.ide.eclipse.adt/palette-preview-r16b-19-apptheme-37wvganexusone/AnalogClock.png
	.metadata/.plugins/com.android.ide.eclipse.adt/palette-preview-r16b-19-apptheme-37wvganexusone/CalendarView.png
	.metadata/.plugins/com.android.ide.eclipse.adt/palette-preview-r16b-19-apptheme-37wvganexusone/DigitalClock.png
	.metadata/.plugins/org.eclipse.cdt.core/.log
	.metadata/.plugins/org.eclipse.core.resources/.projects/PHMS/.indexes/a0/5f/properties.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/PHMS/.indexes/a0/d6/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/PHMS/.indexes/a0/d6/properties.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/PHMS/.indexes/e4/81/96/9e/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/PHMS/.indexes/properties.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/PHMS/.markers
	.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.index
	.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	.metadata/.plugins/org.eclipse.core.runtime/.settings/com.android.ide.eclipse.adt.prefs
	.metadata/.plugins/org.eclipse.core.runtime/.settings/com.android.ide.eclipse.ddms.prefs
	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.debug.ui.prefs
	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.launching.prefs
	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.ide.prefs
	.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	.metadata/.plugins/org.eclipse.jdt.core/972044043.index
	.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps
	.metadata/.plugins/org.eclipse.jdt.core/nonChainingJarsCache
	.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt
	.metadata/.plugins/org.eclipse.jdt.core/variablesAndContainers.dat
	.metadata/.plugins/org.eclipse.jdt.launching/.install.xml
	.metadata/.plugins/org.eclipse.jdt.launching/libraryInfos.xml
	.metadata/.plugins/org.eclipse.jdt.ui/QualifiedTypeNameHistory.xml
	.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml
	.metadata/.plugins/org.eclipse.ui.ide/dialog_settings.xml
	.metadata/.plugins/org.eclipse.ui.workbench/dialog_settings.xml
	.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml
	.metadata/.plugins/org.eclipse.wst.xml.core/system_catalog.xml
	PHMS/bin/classes/com/example/phms/FoodEditorActivity$2$1$1.class