Merge branch 'skill1'

Conflicts:
	src/flavio/Jonathan.java