added angular and protractor to the package.json
Delete map.js
Merge pull request #35 from foundersandcoders/fixingacceptancetests

changes protractor config to firefox
empty acceptance tests recorded
merging with remote dev changes
changed https to http
Merge pull request #37 from foundersandcoders/fixingacceptancetests

adds firefox config to protractor config
merging with remote dev branch
merging yet again
Merge pull request #39 from foundersandcoders/testing-protractor

Testing protractor
fixes package.json conflicts