initial commit
put build instructions into read me
added more to gitignore
preparing merge
preparing merge
preparing merge
preparing merge
Merge branch 'master' of github.com:renard314/textfairy

Conflicts:
	.gitignore
	.gitmodules
	ActionBarSherlock
	Android-ViewPagerIndicator
	OCRTest/.cproject
	OCRTest/.project
	OCRTest/binarized.bmp
	OCRTest/foreground.bmp
	OCRTest/pics/13.jpg
	OCRTest/pixConvEdges.bmp
	OCRTest/rank.bmp
	OCRTest/src/main.cpp
	OCRTest/src/util.cpp
	OCRTest/toThresh.bmp
	README.md
	ViewPager3D
	textfairy/.cproject
	textfairy/AndroidManifest.xml
	textfairy/jni/Android.mk
	textfairy/jni/tesseract/Android.mk
	textfairy/jni/tesseract/ocr.cpp
	textfairy/libs/android-support-v4.jar
	textfairy/project.properties
	textfairy/res/values-de/strings.xml
	textfairy/res/values/preference_keys.xml
	textfairy/res/values/strings.xml
	textfairy/res/xml/settings.xml
	textfairy/src/com/googlecode/tesseract/android/OCR.java
	textfairy/src/com/renard/install/InstallActivity.java
	textfairy/src/com/renard/ocr/ChooseLanguageDialog.java
	textfairy/src/com/renard/ocr/help/AppOptionsActivity.java
	textfairy/src/com/renard/ocr/help/OCRLanguageActivity.java
	textfairy/src/com/renard/ocr/help/OCRLanguageInstallService.java
	textfairy/src/com/renard/start/StartActivity.java
	textfairy/src/com/renard/util/PreferencesUtils.java
	textfairy/src/com/renard/util/Util.java