added TODO
Merge branch 'master' into firstBranch

Conflicts:
	src/ken/Main.java