where the hell is stash in eGit?
Merge branch 'master' of github.com:raphaelsavina/battleship-client
A god-forsaken mess.