some adjustments.
Merge branch 'master' of https://github.com/tarrsalah/thesis

Conflicts:
	tex/main.pdf