dikit
Merge branch 'master' of github.com:igrir/teroka

Conflicts:
	src/com/tanyoo/teroka/view/Help1.java