Test
Merge branch 'master' of https://github.com/richkcho/D4D_translation_app

Conflicts:
	D4DTranslationApp/src/com/example/d4dtranslationapp/MainActivity.java

Hur durr testing the conflict res