deleted all the original master files on my local; copied and pasted files from rob_v7 branch in its place