deleted:    report.aux
deleted:    report.log
deleted:    report.out
deleted:    report.synctex.gz
deleted:    report.toc
modified:   shading/phong.tex
Changes not staged for commit:
modified:   report.tex
Merge branch 'master' of github.com:Bladtman242/sigb2013.3

Conflicts:
	Assignment3_2/report/report.aux
	Assignment3_2/report/report.log
	Assignment3_2/report/report.out
	Assignment3_2/report/report.synctex.gz
	Assignment3_2/report/report.toc

modified:   ../Assignment3.py
new file:   pics/EstimatedLight.png
new file:   pics/phongDiffuseOnly.png
new file:   pics/phongShading.png
new file:   pics/phongSpecularShading.png
modified:   shading/estimatingImpact.tex
new file:   ../shade phong diffuse only.avi