-
-
Merge branch 'master' of https://github.com/phil8192/ticker

Conflicts:
	pom.xml
-