Added Boulder and RNG classes
Resolved conflicts