add scala stuff
merging remote