Merge pull request #22 from nwu-computer-science-1000/master

Merge pull request #21 from nwu-computer-science-1000/revert-20-master
Merge pull request #23 from nwu-computer-science-1000/revert-20-master

Merge pull request #22 from nwu-computer-science-1000/master