Added a button click listener for the SendFile button for uploading
files.

Added the uploadFile method to the SendFile Activity
Merge branch 'pr/6'

Conflicts:
	bin/R.txt
	src/edu/temple/encryptedfiletransfer/SendFile.java
Updated AddFriend Activity