initial commit
Merge remote-tracking branch 'origin/master'
added MS stuff to git ignore