Merge branch 'master' of gitlab.science.ru.nl:mlubbers/ssproject1617

diff --combined report/report.tex
index 7786e83,63f0c6d..c365b4e
--- 1/report/report.tex
--- 2/report/report.tex
+++ b/report/report.tex
@@@ -47,14 -47,10 +47,10 @@@
    \subsection{Data Protection}
    \input{v9_data.tex}
  
 -  \addtocounter{subsection}{2}
 +  \addtocounter{subsection}{1}
    \subsection{\HTTP{} Security}
    \input{v11_httpsec.tex}
  
-   \addtocounter{subsection}{4}
-   \subsection{Files and Recourses}
-   TODO
- 
    \renewcommand\thesubsection{\arabic{section}.\arabic{subsection}}