verticles
Merge branch 'master' of github.com:jcze91/ChifoumiSpoke

Conflicts:
	ShifumiServ/src/main/java/com/mti/ListenVerticle.java
	ShifumiServ/src/main/java/com/mti/model/Match.java
	ShifumiServ/src/main/java/com/mti/model/User.java