Sending merges and deleted cards to server, too tired to continue
Merge remote-tracking branch 'origin/master'