Made Extra Pages
Merge branch 'master' of https://github.com/camo1018/MyKitchen

Conflicts:
	.metadata/.log
	.metadata/.plugins/org.eclipse.cdt.core/.log
	.metadata/.plugins/org.eclipse.core.resources/.projects/Android/.indexes/a0/5f/properties.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/Android/.indexes/a0/d6/properties.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/Android/.indexes/a0/de/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/Android/.indexes/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/Android/.indexes/properties.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/Android/.markers
	.metadata/.plugins/org.eclipse.core.resources/.projects/Android/.markers.snap
	.metadata/.plugins/org.eclipse.core.resources/.projects/Android/.syncinfo.snap
	.metadata/.plugins/org.eclipse.core.resources/.root/.markers.snap
	.metadata/.plugins/org.eclipse.core.resources/.root/2.tree
	.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	.metadata/.plugins/org.eclipse.core.resources/.snap
	.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	.metadata/.plugins/org.eclipse.jdt.core/2814798127.index
	.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/0.png
	.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml
	Android/AndroidManifest.xml
	Android/bin/Android.apk
	Android/bin/AndroidManifest.xml
	Android/bin/classes.dex
	Android/bin/classes/com/example/mykitchen/LoginActivity$UserLoginTask.class
	Android/bin/classes/com/example/mykitchen/LoginActivity.class
	Android/bin/classes/com/example/mykitchen/R$string.class
	Android/bin/classes/com/example/mykitchen/R$style.class
	Android/bin/classes/com/example/mykitchen/R$styleable.class
	Android/bin/resources.ap_
	Android/gen/com/example/mykitchen/R.java
	Android/res/values/strings.xml
	Android/res/values/strings_activity_login.xml