Merge pull request #11 from AnastasiaStudent/Johnmalc-master

Johnmalc master (reverted from commit 6568a6ec975fef24bc754b8f2fcaf557999f80a6)
Merge pull request #11 from AnastasiaStudent/Johnmalc-master

Johnmalc master (reverted from commit 6568a6ec975fef24bc754b8f2fcaf557999f80a6)
Merge pull request #13 from Johnmalc/Test

Test