pull
pull
Merge branch 'master' of github.com:vidalbenjoe/iClassify

Conflicts:
	appcompat_v7/.classpath
	appcompat_v7/bin/android-support-v7-appcompat.jar
	iClassify/.project
	iClassify/bin/R.txt
	iClassify/bin/classes.dex
	iClassify/bin/classes/android/support/v7/appcompat/R$attr.class
	iClassify/bin/classes/android/support/v7/appcompat/R$bool.class
	iClassify/bin/classes/android/support/v7/appcompat/R$color.class
	iClassify/bin/classes/android/support/v7/appcompat/R$dimen.class
	iClassify/bin/classes/android/support/v7/appcompat/R$id.class
	iClassify/bin/classes/android/support/v7/appcompat/R$integer.class
	iClassify/bin/classes/android/support/v7/appcompat/R$layout.class
	iClassify/bin/classes/android/support/v7/appcompat/R$string.class
	iClassify/bin/classes/android/support/v7/appcompat/R$style.class
	iClassify/bin/classes/android/support/v7/appcompat/R$styleable.class
	iClassify/bin/classes/at/technikum/mti/fancycoverflow/R$string.class
	iClassify/bin/classes/bayesdiscussflip/NativeBayesLayoutActivity.class
	iClassify/bin/classes/com/capstoneii/iclassify/MainActivityController$CustomViewGroup$1.class
	iClassify/bin/classes/com/capstoneii/iclassify/MainActivityController$CustomViewGroup.class
	iClassify/bin/classes/com/capstoneii/iclassify/MainActivityController$ViewGroupExampleAdapter.class
	iClassify/bin/classes/com/capstoneii/iclassify/MainActivityController.class
	iClassify/bin/classes/com/capstoneii/iclassify/R$attr.class
	iClassify/bin/classes/com/capstoneii/iclassify/R$bool.class
	iClassify/bin/classes/com/capstoneii/iclassify/R$color.class
	iClassify/bin/classes/com/capstoneii/iclassify/R$dimen.class
	iClassify/bin/classes/com/capstoneii/iclassify/R$drawable.class
	iClassify/bin/classes/com/capstoneii/iclassify/R$id.class
	iClassify/bin/classes/com/capstoneii/iclassify/R$integer.class
	iClassify/bin/classes/com/capstoneii/iclassify/R$layout.class
	iClassify/bin/classes/com/capstoneii/iclassify/R$menu.class
	iClassify/bin/classes/com/capstoneii/iclassify/R$string.class
	iClassify/bin/classes/com/capstoneii/iclassify/R$style.class
	iClassify/bin/classes/com/capstoneii/iclassify/R$styleable.class
	iClassify/bin/classes/com/capstoneii/iclassify/viewpager/ThirdFragment.class
	iClassify/bin/classes/com/capstoneii/iclassify/viewpager/ViewPagerIntro.class
	iClassify/bin/classes/com/openaphid/flip/R$attr.class
	iClassify/bin/classes/com/openaphid/flip/R$drawable.class
	iClassify/bin/classes/com/openaphid/flip/R$id.class
	iClassify/bin/classes/com/openaphid/flip/R$string.class
	iClassify/bin/classes/com/openaphid/flip/R$style.class
	iClassify/bin/classes/com/openaphid/flip/R$styleable.class
	iClassify/bin/classes/coverflow/ClassifyFancyCoverFlowAdapter.class
	iClassify/bin/classes/descisiondiscussflip/DescTreeLayoutActivity.class
	iClassify/bin/classes/drawer/CustomAdapter.class
	iClassify/bin/classes/drawer/MainDrawerActivity.class
	iClassify/bin/classes/knearestdiscussflip/KNearestLayoutActivity.class
	iClassify/bin/dexedLibs/android-support-v4-6840d2a7cd5fd22cc7c03fb0bb5925cb.jar
	iClassify/bin/dexedLibs/android-support-v7-appcompat-9e166a98107312d5bde0533dc2f1e6d0.jar
	iClassify/bin/dexedLibs/aphid-flipview-library-aa8ded91acbc0925d8d91d4aaf84493e.jar
	iClassify/bin/dexedLibs/library-04af45e82ff0a3ada6cc654ab224d7ce.jar
	iClassify/bin/iClassify.apk
	iClassify/bin/jarlist.cache
	iClassify/bin/resources.ap_
	iClassify/gen/android/support/v7/appcompat/R.java
	iClassify/gen/at/technikum/mti/fancycoverflow/R.java
	iClassify/gen/com/capstoneii/iclassify/R.java
	iClassify/gen/com/openaphid/flip/R.java
	library/.classpath
	library/bin/library.jar