fix merge conflicts
Merge branch 'master' of github.com:foundersandcoders/camdenmaps
Merge pull request #36 from foundersandcoders/dev

merging protractor firefox config to master
Merge pull request #38 from foundersandcoders/dev

fixing protractor.conf
Merge pull request #41 from foundersandcoders/dev

Fixing tests
Merge pull request #43 from foundersandcoders/dev

adds chrome back to protractor tests
Merge pull request #46 from foundersandcoders/dev

adds saucelab config
Merge pull request #48 from foundersandcoders/dev

saucelab fixes
Update README.md
dummy commit
reformats travis.yml
rereformats travis.yml
rerereformats travis
Update .travis.yml
Update .travis.yml
fixing fortmatting error
readds saucelab env variables
fixes scrip
temporarily remove saucelab config
Delete test.txt