fixed broken merge
minor changes
added minmax in correct folder
Merge remote-tracking branch 'Chekcers/master'
merge from oryan
added king_tests file to settings