1
2
smshandler index fix
guh
afwef
yay
conversation history loading!
Merge branch 'master' into becktk/active

Conflicts:
	Application/app/src/main/AndroidManifest.xml
	Application/app/src/main/java/edu/vanderbilt/cs285/secure_sms/ConversationActivity.java

merging
Merge branch 'becktk/active'