%%\subsection{Recommended cipher suites}
+<<<<<<< HEAD
In principle system administrators who want to improve their communication security
have ton make a difficult decision between effectively locking out some users and
keeping high cipher suite security while supporting as many users as possible.
a tool to test their setup and compare compatibility with clients. The authors made
use of ssllabs.com to arrive at a set of cipher suites which we will recommend
throughout this document.\\
+=======
+In principle system administrators who want to improve their servers have to
+make a difficult decision between locking out some users and keeping high
+cipher suite security while supporting as many users as possible.
+The website \url{https://www.ssllabs.com/} gives administrators a
+tool to test their setup. The authors made use of ssllabs.com
+to arrive at a set of cipher suites which we will recommend throughout this
+document.\\
+>>>>>>> af7f2e99d0778d0e9828ca8b21c96bc0e462fea4
\textbf{Caution: these settings can only represent a subjective
choice of the authors at the time of writing. It might be a wise choice to