merge work from other computer

was working on two computers. Merged work.