Fixed the last few things
Merge branch 'master' of https://github.com/mikkelam/cecs429proj