Mbiel/lab2

Lab 2 complete