This branch should be up to date

I was originally under the impression after speaking to Fares last night that he would place the text in and I would format it, however I am not certain whether he didn't manage to push the changes or otherwise changed his mind. I created text and formatted it accordingly, and I'll also try to contact him some time after he arrives to clarify.

-Michael