First commit, ignored some files
merged .gitignore