From: Wouter Kuhnen <w.kuhnen@student.science.ru.nl>
Date: Wed, 9 Nov 2016 12:11:59 +0000 (+0100)
Subject: Merge branch 'wip' into 'master'
X-Git-Url: https://git.martlubbers.net/?a=commitdiff_plain;h=6e2ee6c60ca98548c2df058f2e6423e764402acb;p=ssproject1617.git

Merge branch 'wip' into 'master'

add sections 3 and 7

workin' on 3 & 7

See merge request !2
---

6e2ee6c60ca98548c2df058f2e6423e764402acb
diff --cc report/report.tex
index 7f0de16,3adc272..328d443
--- a/report/report.tex
+++ b/report/report.tex
@@@ -5,19 -5,11 +5,20 @@@
  \input{organization.tex}
  
  \section{Verdict}
 +
 +\subsection*{General comments}
 +
 +\begin{itemize}
 +  \item \TODO{} (Kelley) Server instellingen.
 +  \item \TODO{} (Kelley) \code{installer.php} and server code execution.
 +\end{itemize}
 +
  \addtocounter{subsection}{1}
  \subsection{Authentication}
 +\input{v2_authentication}
  
  \subsection{Session Management}
+ \input{v3_session.tex}
  
  \subsection{Access Control}
  \input{v4_access.tex}