Added handins and changed som stuff
merged