pulled down toms latest copy
merged repo
edited the nav bar with tom and tristians