First commit
Edited README via GitHub
Edited pom.xml via GitHub
Edited pom.xml via GitHub
Merge remote-tracking branch 'remotes/pshken/master'

Conflicts:
	pom.xml