Minor changes
Merge branch 'master' of https://github.com/OpenLEAD/jirau.git

Conflicts:
	master.log
	master.pdf
	master.synctex.gz
	sonar/02_Materials.aux