Added

Risk table to appendix
Added picture
Somthing to picture
Added appendix in master
Updated budget and risks
removed conflict

Conflicts:
	report/master_doc.tex