Merge remote-tracking branch 'koen/master'
final
Merge remote-tracking branch 'upstream/master'
mate now random
added equality and fixed some stuff and draw
Merge remote-tracking branch 'upstream/master'
merge
final version maybe push
*
Merge remote-tracking branch 'josef/master'