deleted:    ../Part2/SIGBTools.py
	deleted:    ../Part2/__init__.py
Merge branch 'master' of github.com:itu-cstp/sigb2013
new file:   bladt.tex
modified:   main.tex
new file:   pics/normallines_with_maxima_vs_gradient.png
Merge branch 'master' of github.com:itu-cstp/sigb2013

Conflicts:
	report/main.tex