some refactoring, not that important
Merge branch 'master' of github.com:poi33/Funler

Conflicts:
	funler/bin/funler/Funler.class
Merge branch 'master' of github.com:poi33/Funler

Conflicts:
	funler/bin/funler/Funler.class
	funler/src/funler/Map.java