yep
Merge branch 'master' of github.com:Matthalp/ee382v-hw3

Conflicts:
	template.pdf
	tex/performance.tex
gitignore
aw yeah