add DotSettings file to ignored
added MasterStuff
change merge settings for project and solution files
merge from master