update

am learning something about merging with git  :P