clrf -> lf
Merge branch 'based-on-2015' of github.com:niloufars/CSCW2016 into test-release