test token sample
Merge branch 'master' of https://github.com/dragonwarrior01/test01.git

Conflicts:
	tjl/pom.xml