Preliminary Splitting
preparing to merge some code in master that was left behind
merged in master changes
Fixed infinite loop
temp commit
Revert "Fix bug in strategy"

This reverts commit 706d13192eff33a3c71d5279e50a2830fc9d6568.

Conflicts:
	src/Engine/Strategy.java
Conflicts
Update strategy
working split merged with basic strategy
re-added some hashmap functions
Merged with master