Merge pull request #2 from JrPribs/master

updating repo
Merge pull request #7 from theApparatus/master

Merge pull request #2 from JrPribs/master