gitignore updated
fix conflit
build.sbt updated
build.sbt updated