Geen idee
Gave project.pdf its correct name
Merging
Fixed loop in search.java
Added Analysis of Security
Definitely fixed loop in search
de sprintretrospectives in aparte bestandjes
Added ;s
added library and fixed register
Removed images from posts, made post thumbnails smaller, enabled to load 6 posts of new and popular in the index, added functionality to search field in navbar, potentially fixed mailbox.jsp
Merge branch 'Bas'
Merge branch 'Sophie'

Conflicts:
	Code/src/main/webapp/pages/index.jsp
Merge branch 'Iris'
Merge branch 'Jeroen'