init
Merge branch 'master' of github.com:adlnet/jxapi

Conflicts:
	.gitignore