Ready to go!
Merge branch 'master' of github.com:tenjava/slipcor-t2

Conflicts:
	pom.xml