inital commit
Fixed my fiiiirst merge issue