Finished part 1
Merge branch 'master' of https://github.com/tgriffit/CS499Assignment3

Uhh...