Got some more work done
Merge branch 'master' of https://github.com/CaseyMcGuire/CS315_Fall2014