initial commit
gitigore conflict reolved