Add files for Flag
Get most stuff right
Merge branch 'AndrewAday' into KevinZhou

Conflicts:
	workspace/.DS_Store
	workspace/.metadata/.log

workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/Americ
anFlag/.indexes/e4/history.index

workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/Americ
anFlag/.markers

workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/Americ
anFlag/org.eclipse.jdt.core/state.dat

workspace/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/h
istory.version

workspace/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/p
roperties.index

workspace/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/p
roperties.version

workspace/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.e
clipse.core.resources

workspace/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.ecli
pse.core.resources.prefs

workspace/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.ecli
pse.debug.ui.prefs

workspace/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.ecli
pse.jdt.core.prefs

workspace/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.ecli
pse.jdt.launching.prefs

workspace/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.ecli
pse.jdt.ui.prefs

workspace/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.ecli
pse.pde.api.tools.prefs

workspace/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.ecli
pse.ui.editors.prefs

workspace/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.ecli
pse.ui.ide.prefs

workspace/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.ecli
pse.ui.prefs

workspace/.metadata/.plugins/org.eclipse.debug.core/.launches/AmericanFl
ag.launch
	workspace/.metadata/.plugins/org.eclipse.debug.ui/dialog_settings.xml

workspace/.metadata/.plugins/org.eclipse.debug.ui/launchConfigurationHis
tory.xml
	workspace/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	workspace/.metadata/.plugins/org.eclipse.jdt.core/1271342938.index
	workspace/.metadata/.plugins/org.eclipse.jdt.core/1384487945.index
	workspace/.metadata/.plugins/org.eclipse.jdt.core/156905802.index
	workspace/.metadata/.plugins/org.eclipse.jdt.core/1819685514.index
	workspace/.metadata/.plugins/org.eclipse.jdt.core/1833648217.index
	workspace/.metadata/.plugins/org.eclipse.jdt.core/2192948998.index
	workspace/.metadata/.plugins/org.eclipse.jdt.core/2326659272.index
	workspace/.metadata/.plugins/org.eclipse.jdt.core/2545238116.index
	workspace/.metadata/.plugins/org.eclipse.jdt.core/272178059.index
	workspace/.metadata/.plugins/org.eclipse.jdt.core/3000285004.index
	workspace/.metadata/.plugins/org.eclipse.jdt.core/3004609673.index
	workspace/.metadata/.plugins/org.eclipse.jdt.core/3266567714.index
	workspace/.metadata/.plugins/org.eclipse.jdt.core/3302703152.index
	workspace/.metadata/.plugins/org.eclipse.jdt.core/3321539481.index
	workspace/.metadata/.plugins/org.eclipse.jdt.core/3712507179.index
	workspace/.metadata/.plugins/org.eclipse.jdt.core/3954040986.index
	workspace/.metadata/.plugins/org.eclipse.jdt.core/4238209716.index
	workspace/.metadata/.plugins/org.eclipse.jdt.core/4249315662.index
	workspace/.metadata/.plugins/org.eclipse.jdt.core/450555687.index
	workspace/.metadata/.plugins/org.eclipse.jdt.core/765977872.index
	workspace/.metadata/.plugins/org.eclipse.jdt.core/770573466.index
	workspace/.metadata/.plugins/org.eclipse.jdt.core/84777399.index

workspace/.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps
	workspace/.metadata/.plugins/org.eclipse.jdt.core/invalidArchivesCache
	workspace/.metadata/.plugins/org.eclipse.jdt.core/javaLikeNames.txt
	workspace/.metadata/.plugins/org.eclipse.jdt.core/nonChainingJarsCache
	workspace/.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt

workspace/.metadata/.plugins/org.eclipse.jdt.core/variablesAndContainers
.dat
	workspace/.metadata/.plugins/org.eclipse.jdt.launching/.install.xml
	workspace/.metadata/.plugins/org.eclipse.jdt.launching/libraryInfos.xml
	workspace/.metadata/.plugins/org.eclipse.jdt.ui/OpenTypeHistory.xml

workspace/.metadata/.plugins/org.eclipse.jdt.ui/QualifiedTypeNameHistory
.xml
	workspace/.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml

workspace/.metadata/.plugins/org.eclipse.ui.workbench/dialog_settings.xm
l
	workspace/.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml
	workspace/.metadata/version.ini
stars working
asdf
Merge branch 'KevinZhou'