orginize and add template to the report
Merge branch 'master' of https://github.com/tpospisi/rollcall

Conflicts:
	txt/midway/midterm.bib
	txt/midway/midterm.tex
solve conflicts