Merge branch 'java' of https://github.com/diezcami/thefuck into diezcami-java

Conflicts:
	README.md

README.md

@@ -155,7 +155,8 @@ using the matched rule and runs it. Rules enabled by default are as follows:
 * `django_south_ghost` – adds `--delete-ghost-migrations` to failed because ghosts django south migration;
 * `django_south_merge` – adds `--merge` to inconsistent django south migration;
 * `fix_alt_space` – replaces Alt+Space with Space character;
-* `javac` – appends missing `.java` when compiling Java files
+* `javac` – appends missing `.java` when compiling Java files;
+* `java` – removes `.java` extension when running Java programs;
 * `git_add` – fix *"Did you forget to 'git add'?"*;
 * `git_checkout` – creates the branch before checking-out;
 * `git_no_command` – fixes wrong git commands like `git brnch`;