commit from eclipse
commit again
commit asap
commit
commit from intellij idea 13.1.1
Merge remote-tracking branch 'origin/master'

Conflicts:
	JavaTest/src/icmyfuture/First.java
commit from intellij idea 13.1.1
commit from intellij idea 13.1.1