fixed git curupt file and added changes from this week