Merge pull request #1 from CST316GroupO/master

made some important changes
Merge pull request #2 from austinpruitt/master

Merge pull request #1 from CST316GroupO/master