some more stuff.
Merge branch 'master' of https://github.com/ryan-printz/CS261_2