money operations java added
gitignore conflict resolved