modified:   illumination/specular.tex
modified:   report.tex
modified:   shading/phong.tex
Merge branch 'master' of github.com:Bladtman242/sigb2013.3

Conflicts:
	Assignment3_2/report/shading/phong.tex

modified:   shading/estimatingImpact.tex
deleted:    shading/main.log
modified:   shading/phong.tex