first commit
removed gitignore because of a conflict