Before rekkage
Merge branch 'master' of https://github.com/Proftaak-P4-2014-S25a/P4-Web-Application.git