I don't understand Marks stuff.

@Marks, why do you have 2 "src" folders? one in the main folder, and
one in /Echode/? wtf? plz xplein to meh
dunno
sorry if this messes you up
what
no rly what
Merge branch 'master' of https://github.com/marksomnian/echode

Conflicts:
	Echode/bin/echode/EchodeGUI.class