1
1
2
Merge branch 'master' of https://github.com/expected/ubi

Conflicts:
	TheMotivator/bin/AndroidManifest.xml
	TheMotivator/bin/R.txt
	TheMotivator/bin/TheMotivator.apk
	TheMotivator/bin/classes.dex
	TheMotivator/bin/classes/com/example/themotivator/MainActivity$1.class
	TheMotivator/bin/classes/com/example/themotivator/MainActivity$MySimpleArrayAdapter.class
	TheMotivator/bin/classes/com/example/themotivator/MainActivity$PlaceholderFragment.class
	TheMotivator/bin/classes/com/example/themotivator/MainActivity$StableArrayAdapter.class
	TheMotivator/bin/classes/com/example/themotivator/MainActivity.class
	TheMotivator/bin/classes/com/example/themotivator/R$id.class
	TheMotivator/bin/classes/com/example/themotivator/R$integer.class
	TheMotivator/bin/classes/com/example/themotivator/R$layout.class
	TheMotivator/bin/classes/com/example/themotivator/R$menu.class
	TheMotivator/bin/resources.ap_
	TheMotivator/gen/com/example/themotivator/R.java