Finishing setup on my Linux machine.
Merge branch 'master' of https://github.com/jwhite37/csc253Project

Merge from source.