bugfixes
merged
merged .gitignore
Merge branch 'master' of github.com:wpfff/qtlab-diamond-master
Merge branch 'master' of github.com:wpfff/qtlab-diamond-master