Included wireframes in separate folder
Fixed merge conflicts, included wireframes in sep folder