merge messed up
dev lt to a new branch
Merge branch 'homework'