First Commit with files
Fixed conflict on .gitngore