refactoring of feature
Merge branch 'master' of https://github.com/wensby/ai-project.git

Conflicts:
	src/Feature.java