added some gitignores
Some dry tests
Merge remote-tracking branch 'origin/master'