introduced simple webapp to test, shared webdriver
fixed merge conflict