resolve git conflict

Author: stonebig

index.html

@@ -33,6 +33,7 @@ <h2 id="releases">Recent Releases </h2>
 			<li>WinPython <strong>3.4</strong>.4.2Qt5 (*)<a href="https://github.com/winpython/winpython/blob/master/changelogs/WinPythonQt5-3.4.4.2_History.md">Changelog</a>, <a href="https://github.com/winpython/winpython/blob/master/changelogs/WinPythonQt5-3.4.4.2.md">Packages</a> and <a href="https://sourceforge.net/projects/winpython/files/WinPython_3.4/3.4.4.2/">Downloads</a></li>
 			<li>WinPython <strong>3.5</strong>.1.3 (*) <a href="https://github.com/winpython/winpython/blob/master/changelogs/WinPython-3.5.1.3_History.md">Changelog</a>, <a href="https://github.com/winpython/winpython/blob/master/changelogs/WinPython-3.5.1.3.md">Packages</a> and <a href="https://sourceforge.net/projects/winpython/files/WinPython_3.5/3.5.1.3/">Downloads</a></li>
 		</ul>
+
 		<p>Release <a href="https://github.com/winpython/winpython/issues/217">2016-01</a> of February 9th, 2016 </p>
 		<p>Highlights: Jupyter Notebook 4.1, IDLEX, closer integration with pip, full support of '@' in WinPython 3.5 (<a href="https://github.com/winpython/winpython/blob/master/changelogs/WinPythonZero-3.4.4.1.md">Zero</a> Version)</p>
 		<ul>