Merging
Added .gitingore