interfaces version1
modifier interfaces
add gitignore
add master gitignore
fix conflit