hip to be square
Merge branch 'master' of https://github.com/bjued/week1