initial release
merge
fix gitignore