first commit
done api
fix gitignore conflict