HELLO
gdfg
Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/HackathonContactShare.apk
	bin/R.txt
	bin/classes.dex
	bin/classes/com/amazon/hackathon/contactshare/activity/MainActivity$1.class
	bin/classes/com/amazon/hackathon/contactshare/activity/MainActivity$2$1.class
	bin/classes/com/amazon/hackathon/contactshare/activity/MainActivity$2.class
	bin/classes/com/amazon/hackathon/contactshare/activity/MainActivity$3.class
	bin/classes/com/amazon/hackathon/contactshare/activity/MainActivity$4.class
	bin/classes/com/amazon/hackathon/contactshare/activity/MainActivity$PlaceholderFragment.class
	bin/classes/com/amazon/hackathon/contactshare/activity/MainActivity.class
	bin/classes/com/amazon/hackathon/contactshare/activity/PersonalArchiveActivity.class
	bin/classes/com/amazon/hackathoncontactshare/R$id.class
	bin/classes/com/amazon/hackathoncontactshare/R$integer.class
	bin/classes/com/amazon/hackathoncontactshare/R$layout.class
	bin/classes/com/amazon/hackathoncontactshare/R$menu.class
	bin/classes/com/amazon/hackathoncontactshare/R$string.class
	bin/classes/com/amazon/hackathoncontactshare/R$style.class
	bin/classes/com/amazon/hackathoncontactshare/R$styleable.class
	bin/resources.ap_
	gen/com/amazon/hackathoncontactshare/R.java
	src/com/amazon/hackathon/contactshare/activity/MainActivity.java