adaugat clasa pt tabla
merged core into master