Updates
Merge branch 'master' of https://github.com/talamb/eecs690pt2