fffgg
Merge branch 'master' of
https://github.com/robertcao/CMPE275_Project1.git

Conflicts:
	src/project1/cmpe275/sjsu/HttpUploadServerHandler.java

Change-Id: I5bf69fcdb96b72046a1d40bdeedb4cc2496887dd
Update Slave