fixing stuff
merged master into my branch
checkout
merged