blah
blah
Merge branch 'master' of github.com:vert-x/vertx-gradle-template
upgraded deps
Merge branch 'master' of https://github.com/vert-x/vertx-gradle-template

# By purplefox
# Via purplefox
* 'master' of https://github.com/vert-x/vertx-gradle-template:
  upgraded deps
  blah
  blah

Conflicts:
	src/main/java/com/mycompany/myproject/PingVerticle.java