Issue with Merging, have gone back to Josh's UpdateMakeFile commit + my ...

...changes