working on the strategy
Merge branch 'origin/master'

Conflicts:
	pom.xml