I have no idea what I'm doing
Merge branch 'dev-hw3' of github.com:3Legs/w4118 into bank-hw3