merged all files

sorry guys, still trying to figure this out.