resolved conflict
 added sl to todo project
asd
removed unnecesary files
bm fixed