mega updates :)))
merged conflicts
removed stupid files