before sync
Merge branch 'ssl' of https://github.com/txlife/cits3002-1 into ssl

Conflicts:
	include/trustcloud.h
	src/trustcloud.c