Merge pull request #983 from peastman/algorithm

Fixed compilation errors on Visual Studio 2013

platforms/cpu/src/CpuNonbondedForceVec4.cpp

@@ -24,6 +24,7 @@
 
 #include "SimTKOpenMMUtilities.h"
 #include "CpuNonbondedForceVec4.h"
+#include <algorithm>
 
 using namespace std;
 using namespace OpenMM;

platforms/cpu/src/CpuNonbondedForceVec8.cpp

@@ -26,6 +26,7 @@
 #include "CpuNonbondedForceVec8.h"
 #include "openmm/OpenMMException.h"
 #include "openmm/internal/hardware.h"
+#include <algorithm>
 
 using namespace std;
 using namespace OpenMM;