merged files uploaded

(controller-view relations (clicking protocols) in-progress)