changes from lesson 120313
all new files added