Merge Jason/Julia
Merge branch 'master' of https://github.com/geekygirlsarah/cs470project into Julia