Merge branch 'master' of https://github.com/mohzah/ubi

Conflicts:
	Thesis/TeX/Chapters/Initial_Ideas.tex
	Thesis/TeX/myThesis.pdf
Merge branch 'master' of https://github.com/mohzah/ubi