added angular and protractor to the package.json
empty acceptance tests recorded
merging with remote dev changes
changed https to http
merging with remote dev branch
merging yet again
Merge pull request #39 from foundersandcoders/testing-protractor

Testing protractor
adding chromedriver and switching back to chrome
fixes package.json conflicts
Merge pull request #40 from foundersandcoders/fixingacceptancetests

Fixingacceptancetests
Merge pull request #41 from foundersandcoders/dev

Fixing tests