sdfsd
Merge remote-tracking branch 'origin/doing' into doing

Conflicts:
	model.tex
changes
Merge branch 'doing' of https://github.com/srizzling/honors-report-latex into doing

Conflicts:
	model.tex