intermediate commit
merged changes to random.h
fixed merge conflicts, added max() function to mersenneTwister class