some stuff
Merge remote-tracking branch 'origin/master'

Conflicts:
	Design Challenge Report.aux
	Design Challenge Report.lof
	Design Challenge Report.lot
	Design Challenge Report.pdf
	Design Challenge Report.synctex.gz
	Design Challenge Report.tex
	Design Challenge Report.toc