random7.c added
merge conflicts fixed