full restore
Merge branch 'master' of https://github.com/alicansa/230B_Project

Conflicts:
	step1/step1_report.pdf
	step1/step1_report.tex