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

Conflicts:
	src/MoveGeneration.h

src/MoveGeneration.h

@@ -85,6 +85,7 @@ template<int side>
 class chessy::PawnPushGenerator
 {
     const ChessGame& chessGame;
+
     struct MoveIterator
     {
         PositionSet::PositionSetIterator pawnPushes;
@@ -127,7 +128,10 @@ private:
 };
 
 
-class chessy::
+class chessy::RookMoveGenerator
+{
+    
+};
 
 
 #endif // CHESSY_MOVEGENERATION_H