checkout master, on initial setup

otherwise first merge will get confused with all files appearing/dissapearing