Merge branch 'master' of https://gitlab.vis.ethz.ch/niwinkle/chessy

src/Board.cpp

@@ -67,7 +67,7 @@ Bitboard Board::getBlacks(void) const
 
 Bitboard Board::getOccupied(void) const
 {
-    return getWhites() | getBlacks();
+    return getBlacks() | getWhites();
 }
 
 

src/ChessGame.cpp

@@ -13,6 +13,7 @@ bool ChessGame::isValidMove(const Move& move) const
 std::vector<Move> ChessGame::getValidMoves(void) const
 {
     std::vector<Move> ret;
+
     return ret;
 }