Freemarker i orden (hopefully)
Merge branch 'master' of github.com:Stodid/late-term-assignment