Made some changes
tryed to resovle conflict

Merge branch 'master' of https://github.com/danielrasmuson/Stratego2

Conflicts:
	js/setup.js