Fixing bugs
Merge branch 'master' of https://github.com/jchadwick/AutomatedTesting.git
Merge