Ecopuck discussion
Merge branch 'master' of https://github.com/lonnelars/ab334-blue

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