Merge branch 'vladimir'
merges the changes from vladimir's master repo with my minor gitignore changes
This commit is contained in:
commit
c607d916d2
merges the changes from vladimir's master repo with my minor gitignore changes