adding changes made in test1 branch.
Merge branch 'test1'
Added in the changes made from the test1 branch.

Conflicts:
	main.tex