more crap due to mysterious CRLF ending up in files...
Merge branch 'master' of github.com:vegandevs/vegan