Merge pull request #3 from CST316GroupO/master

Merging after help screen update
Merge pull request #10 from brantunger/master

Merge pull request #3 from CST316GroupO/master