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

Conflicts:
	Thesis/TeX/myBib.bib