Final touches
Merge branch 'master' of https://github.com/glisom/EECS448-Final