Normalize line endings
Merge branch 'master' of https://github.com/Mattivc/ggj14