updating branch

making my branch up to date