Added bibtex, and trapezoid image
Merge branch 'master' of github.com:snoooze03/tsfc

Conflicts:
	tex/report.pdf
	tex/report.tex