Added form
Merge branch 'master' of https://github.com/lyngaas/2014-fagdag1-java2