Geen idee
Gave project.pdf its correct name
Merging
Update README.md
delete hallo.txt
Merge branch 'master' of https://github.com/utwente-di/di14
Update README.md
Update README.md
Fixed loop in search.java
Retrospectives per sprint
Merge branch 'master' of https://github.com/utwente-di/di14
Added Analysis of Security
Delete test doc
Definitely fixed loop in search
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
removed double Sprint retrospectives
Merge branch 'Bas'
Merge branch 'Sophie'

Conflicts:
	Code/src/main/webapp/pages/index.jsp