Fixed problems, changed things, more things work.
Merge branch 'master' of github.com:StyrofoamLaser/Linux-Assignment-3