123
Fixed conflict with ana
Novi merge
Commit before merging with Ana
Fixed conflict, nothing major
Fixed aliginment.py conflict
Merge again, hope it works