Fixed a merge conflict in @donnaaboise 2dExamples PR#76