Add log
Merge branch 'master' of https://github.com/pdavid0/GTI785LAB2

Conflicts:
	ARFM/src/ca/etsmtl/gti785/activity/FileListActivity.java
	server/src/ca/etsmtl/gti785/async/CustomAsyncRequest.java