fix
Merge branch 'master' of https://github.com/justindav1s/docker

Conflicts:
	centos-java-tomcat-ssh/Dockerfile