division function added
division function added
Merge branch 'master' of https://github.com/kirillF/sample-jenkins-project into kirillF-master

Conflicts:
	hello/pom.xml
	hello/src/test/java/com/bigfatplayer/hello/AppTest.java
Merge branch 'master' of https://github.com/kirillF/sample-jenkins-project

Conflicts:
	hello/pom.xml
	hello/src/test/java/com/bigfatplayer/hello/AppTest.java
Merge branch 'master' of https://github.com/kirillF/sample-jenkins-project

Conflicts:
	hello/pom.xml
	hello/src/test/java/com/bigfatplayer/hello/AppTest.java
Merge branch 'kirillF-master'

Conflicts:
	hello/pom.xml