synch with master for week 2
wk2 synch
merged with remote