Merge branch 'master' of /Users/judas/Programming/Android/ShadowChess with conflicts.
Pawn
Merge remote-tracking branch 'origin/master'