First Commit
Merge branch 'master' of https://github.com/javiers1/CS356-Proj2