Two views, simple text input example
Merge branch 'master' of https://github.com/kevinychen/waypal.git

Conflicts:
	android/AndroidManifest.xml
Merge branch 'master' of https://github.com/kevinychen/waypal.git

Conflicts:
	android/res/layout/activity_main.xml
	android/res/values/strings.xml
	android/src/com/example/waypal/MainActivity.java