Ok, after merging the /master into /chillz and looking at it on my local machine, everything seems to be in place. I haven't tested functionality but the files all seem to be where they should be, so I believe we are good to merge /chillz into /master
Ok, after merging the /master into /chillz and looking at it on my local machine, everything seems to be in place. I haven't tested functionality but the files all seem to be where they should be, so I believe we are good to merge /chillz into /master