fixed some stupid mistakes
Merge branch 'master' of https://github.com/keatonboyle/lab4