fixed brute force
merged sindre with master and fixed merge conflict in gitignore.