asd
Merge github.com:No6things/ATICOMPANY
dix almost done