Added O'Shaughnessy, Smith, fixed Palmer
Added Bergson and modified Malebranche
Fixed merge conflict