todo for edward
Merge branch 'master' of https://github.com/elmerland/webdev