fix broken test (by ignorning it)
DS_Store garbage
Merge branch 'master' of github.com:gdusbabek/headwater