Merge pull request #39 from MiguelABarbosa/miguel

first selenium test
merge commit
resolved merge conflict
Merge pull request #40 from MiguelABarbosa/mike

Mike
merge commit