jsp updated
web.xml updated
Merge branch 'integration'
Dog class extends Animal
Merge branch 'integration'
main method in Duck.java
Merge branch 'master' into integration
Dog make noise
Duck make noise