merging wip into master
the master gitignore ...