fixed naming conventions
Merge branch 'master' of https://github.com/Tadimsky/CS356-Lab-3