init
Disregard ths commit
Merge branch 'master' of https://github.com/carlmango11/EasyOrder

Conflicts:
	.metadata/.log

.metadata/.plugins/org.eclipse.core.resources/.projects/AndroidApp/.inde
xes/a0/5f/properties.index

.metadata/.plugins/org.eclipse.core.resources/.projects/AndroidApp/.inde
xes/a0/d6/history.index

.metadata/.plugins/org.eclipse.core.resources/.projects/AndroidApp/.inde
xes/a0/d6/properties.index

.metadata/.plugins/org.eclipse.core.resources/.projects/AndroidApp/.inde
xes/a0/de/history.index

.metadata/.plugins/org.eclipse.core.resources/.projects/AndroidApp/.inde
xes/a0/de/properties.index

.metadata/.plugins/org.eclipse.core.resources/.projects/AndroidApp/.inde
xes/e4/81/9f/91/c6/history.index

.metadata/.plugins/org.eclipse.core.resources/.projects/AndroidApp/.inde
xes/e4/81/9f/91/history.index

.metadata/.plugins/org.eclipse.core.resources/.projects/AndroidApp/.inde
xes/history.index

.metadata/.plugins/org.eclipse.core.resources/.projects/AndroidApp/.inde
xes/properties.index

.metadata/.plugins/org.eclipse.core.resources/.projects/AndroidApp/.mark
ers

.metadata/.plugins/org.eclipse.core.resources/.projects/SlidingPanelLibr
ary/.indexes/properties.index

.metadata/.plugins/org.eclipse.core.resources/.projects/Stripe/.indexes/
properties.index

.metadata/.plugins/org.eclipse.core.resources/.projects/TabsLibrary/.ind
exes/properties.index

.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.
index

.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.cor
e.resources

.metadata/.plugins/org.eclipse.core.runtime/.settings/com.android.ide.ec
lipse.adt.prefs

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

.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.co
re.prefs

.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.la
unching.prefs

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

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

.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.wor
kbench.prefs
	.metadata/.plugins/org.eclipse.debug.core/.launches/EasyMenu.launch
	.metadata/.plugins/org.eclipse.debug.ui/launchConfigurationHistory.xml
	.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	.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.ltk.core.refactoring/.refactorings/.works
pace/2013/10/40/refactorings.history

.metadata/.plugins/org.eclipse.ltk.core.refactoring/.refactorings/.works
pace/2013/10/40/refactorings.index
	.metadata/.plugins/org.eclipse.pde.core/.cache/clean-cache.properties
	.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
	AndroidApp/.classpath
	AndroidApp/AndroidManifest.xml
	AndroidApp/bin/AndroidApp.apk
	AndroidApp/bin/AndroidManifest.xml
	AndroidApp/bin/R.txt
	AndroidApp/bin/classes.dex

AndroidApp/bin/classes/com/astuetz/viewpager/extensions/R$styleable.clas
s
	AndroidApp/bin/classes/com/easymenu/android/R$color.class
	AndroidApp/bin/classes/com/easymenu/android/R$dimen.class
	AndroidApp/bin/classes/com/easymenu/android/R$drawable.class
	AndroidApp/bin/classes/com/easymenu/android/R$id.class
	AndroidApp/bin/classes/com/easymenu/android/R$layout.class
	AndroidApp/bin/classes/com/easymenu/android/R$menu.class
	AndroidApp/bin/classes/com/easymenu/android/R$string.class
	AndroidApp/bin/classes/com/easymenu/android/R$style.class
	AndroidApp/bin/classes/com/easymenu/android/R$styleable.class
	AndroidApp/bin/classes/com/easymenu/android/api/ApiResponse.class
	AndroidApp/bin/classes/com/easymenu/android/bos/Card.class
	AndroidApp/bin/classes/com/easymenu/android/bos/Item.class
	AndroidApp/bin/classes/com/easymenu/android/bos/ItemOrder.class
	AndroidApp/bin/classes/com/easymenu/android/bos/Order.class

AndroidApp/bin/classes/com/easymenu/android/findmenu/FindMenuActivity$1.
class

AndroidApp/bin/classes/com/easymenu/android/findmenu/FindMenuActivity$2.
class

AndroidApp/bin/classes/com/easymenu/android/findmenu/FindMenuActivity.cl
ass

AndroidApp/bin/classes/com/easymenu/android/order/CategoryItemsAdapter$I
temHolder.class

AndroidApp/bin/classes/com/easymenu/android/order/CategoryItemsAdapter.c
lass

AndroidApp/bin/classes/com/easymenu/android/order/CategoryItemsFragment$
1.class

AndroidApp/bin/classes/com/easymenu/android/order/CategoryItemsFragment.
class

AndroidApp/bin/classes/com/easymenu/android/order/ChooseCourseDialog.cla
ss

AndroidApp/bin/classes/com/easymenu/android/order/CreateOrderActivity$1.
class

AndroidApp/bin/classes/com/easymenu/android/order/CreateOrderActivity$2.
class

AndroidApp/bin/classes/com/easymenu/android/order/CreateOrderActivity$3.
class

AndroidApp/bin/classes/com/easymenu/android/order/CreateOrderActivity$Ca
tegoryAdapter.class

AndroidApp/bin/classes/com/easymenu/android/order/CreateOrderActivity.cl
ass

AndroidApp/bin/classes/com/easymenu/android/payments/CardListAdapter.cla
ss

AndroidApp/bin/classes/com/easymenu/android/payments/CardViewerActivity$
1.class

AndroidApp/bin/classes/com/easymenu/android/payments/CardViewerActivity.
class

AndroidApp/bin/classes/com/easymenu/android/payments/SelectPaymentActivi
ty.class

AndroidApp/bin/classes/com/google/zxing/integration/android/IntentIntegr
ator$1.class

AndroidApp/bin/classes/com/google/zxing/integration/android/IntentIntegr
ator.class
	AndroidApp/bin/jarlist.cache
	AndroidApp/bin/resources.ap_
	AndroidApp/gen/com/easymenu/android/R.java
	AndroidApp/res/layout/card_list_item.xml
	AndroidApp/res/layout/card_viewer_activity.xml
	AndroidApp/res/layout/category_item_list_item.xml
	AndroidApp/res/layout/create_order_screen.xml
	AndroidApp/res/layout/order_review_item_entry.xml
	AndroidApp/res/values/colors.xml
	AndroidApp/res/values/strings.xml
	AndroidApp/res/values/styles.xml
	AndroidApp/src/com/easymenu/android/api/ApiResponse.java
	AndroidApp/src/com/easymenu/android/bos/Item.java
	AndroidApp/src/com/easymenu/android/bos/ItemOrder.java
	AndroidApp/src/com/easymenu/android/bos/Order.java
	AndroidApp/src/com/easymenu/android/findmenu/FindMenuActivity.java
	AndroidApp/src/com/easymenu/android/order/CategoryItemsAdapter.java
	AndroidApp/src/com/easymenu/android/order/CategoryItemsFragment.java
	AndroidApp/src/com/easymenu/android/order/CreateOrderActivity.java
	AndroidApp/src/com/easymenu/android/payments/CardViewerActivity.java
	AndroidApp/src/com/easymenu/android/payments/SelectPaymentActivity.java
	SlidingPanelLibrary/.classpath

SlidingPanelLibrary/bin/classes/com/astuetz/viewpager/extensions/PagerSl
idingTabStrip$1.class

SlidingPanelLibrary/bin/classes/com/astuetz/viewpager/extensions/PagerSl
idingTabStrip$SavedState.class

SlidingPanelLibrary/bin/classes/com/astuetz/viewpager/extensions/PagerSl
idingTabStrip.class

SlidingPanelLibrary/bin/classes/com/astuetz/viewpager/extensions/R$attr.
class

SlidingPanelLibrary/bin/classes/com/astuetz/viewpager/extensions/R$color
.class

SlidingPanelLibrary/bin/classes/com/astuetz/viewpager/extensions/R$drawa
ble.class

SlidingPanelLibrary/bin/classes/com/astuetz/viewpager/extensions/R$style
able.class
	SlidingPanelLibrary/bin/slidingpanellibrary.jar
	Stripe/bin/classes/com/stripe/android/Stripe.class
	Stripe/bin/classes/com/stripe/android/compat/AsyncTask$3.class
	Stripe/bin/classes/com/stripe/android/compat/AsyncTask.class
	Stripe/bin/classes/com/stripe/android/model/Card.class
	Stripe/bin/stripe.jar
	Stripe/target/test-classes/com/stripe/android/StripeTest.class

TabsLibrary/bin/classes/com/sothree/slidinguppanel/SlidingUpPanelLayout$
DragHelperCallback.class

TabsLibrary/bin/classes/com/sothree/slidinguppanel/SlidingUpPanelLayout$
LayoutParams.class

TabsLibrary/bin/classes/com/sothree/slidinguppanel/SlidingUpPanelLayout$
SavedState.class

TabsLibrary/bin/classes/com/sothree/slidinguppanel/SlidingUpPanelLayout.
class

TabsLibrary/bin/classes/com/sothree/slidinguppanel/library/R$drawable.cl
ass
	TabsLibrary/bin/tabslibrary.jar