commit before merg
Merge branch 'master' of https://github.com/austinemser/Agent-Upload-POC

Conflicts:
	AgentUpload/AgentUpload.iml
	AgentUpload/build/source/r/debug/com/example/agentupload/R.java
	AgentUpload/src/main/java/com/example/agentupload/AgentUploadMainActivity.java
	AgentUpload/src/main/res/layout/activity_agent_upload_main.xml
	AgentUploadProject.iml