Merge pull request #1 from CST316GroupO/master

made some important changes
Merge pull request #8 from gmann1/master

Merge pull request #1 from CST316GroupO/master