Trying to merge the changes khobbits have done back to my branch.

Not really sure if this is the right way to do it, never tried before :)