Updated .gitignore
Merge branch 'test_boost'