Merge pull request #2552 from marcelofern/pedantic-typo

Fix pedantic typo in the index.html template

locust/templates/index.html

@@ -279,7 +279,7 @@ <h1>About</h1>
                 and made it work distributed across multiple machines.
             </p>
             <p>
-                Jonatan, Carl and Joakim Hamrén has continued the development of Locust at their job,
+                Jonatan, Carl, and Joakim Hamrén have continued the development of Locust at their job,
                 ESN Social Software, who have adopted Locust as an inhouse Open Source project.
             </p>