merge fix
Merge branch 'master' of
https://github.com/Widar91/cloud-computing-project.git

Conflicts:
	doc/report/IN4392 Group 5 Large Lab Report.tex