More merging. Will it ever end?
Merge branch 'master' of https://github.com/enfiskutensykkel/hackathon2013