Commiting my changes, before pulling Josh's latest code.
Pulling Josh's latest code.
Merging with Josh, post fix of MakeFiles