initial modifications for adding homework
updated merged files