Added protractor
Added e2e test. Finished testing userform. Added code coverage
Fixed conflicts