Fixed some stuff, write() not finished
Merge branch 'master' of https://github.com/keatonboyle/lab3