Complete...commit
Merge branch 'master' of https://github.com/JrChicken/Lab6n.git