get everything uptodate in master so that other branches can be worked on