first commit
add ignore file
merging