inital commit
Merge https://github.com/atorres92/cse471-project3