Update on report
Update report
Update report
Merge branch 'master' of https://github.com/nickyadvokaat/GridCloudComputing

Conflicts:
	report/report.tex