changes done at erenya forgot to push them..
changes done at erenya lan and forgot to push them..
merged the changes done today in school with the ones at home