created curriculum marc u
created navbar for marc u, etc
merged x's and i's stuff