Merge branch 'master' of C:\Users\Chan\AndroidStudioProjects\Polyu.Cloud with conflicts.
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/com/example/polyucloud/app/CloudListActivity.java
delete file final
delete folder