add new files
add gitignore file
fix merge