modified .gitignore
add seven.txt
dev merge master