i don't remember
Merge branch 'master' of https://github.com/BoZenKhaa/audrey_thesis

Conflicts:
	testagainchap7.tex
many changes with the tables especially top alignment using parbox