reset head
reset head
some changes
some changes
some changes
Merge branch 'origin' of http://github.com/alanshearer/thesis into origin

Conflicts:
	Tesi.tex
	capitolo7.tex
	conclusioni.tex
	introduzione.tex
	unitemplatetesi.tex