Merge pull request #3 from CSUChicoSoftwareEngineering/j_branch

J branch