Correcting javadoc...crying
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/com/esgi/honeycode/MainWindowUI.java
REcommit fuck