removed some warnings
tweaking gitignore and adding gitattributes
fix conflicts