Line endings
Merge branch 'master' of https://github.com/alekratz/apphack2-project