stuffy
stusts
Merge branch 'master' of https://github.com/jnshi/6784project

Conflicts:
	finalreport/finalreport.tex