Rewrite week 2
Merge branch 'master' of https://github.com/vastus/hautala.js