fixed and finished task1
done 2.2, started 2.3