added random... to delete soon
changed stuff
murder git
fuck you git
fuck offf git
fuck off
fix merge conflict
made mistake with branch. now fixed"
fixed merge conflict