Merge branch 'master' of github.com:dopefishh/sec2014 into commentaar_verwerken