complete home work assignment one
merging
merge comflict fix