new dockerfile
Merge branch 'master' of https://github.com/RoastBeefSandwichCo/Docker-Gatewayd

Conflicts:
	Dockerfile

merge