expanded tabs to spaces
reverted spaces to tabs in Makefile
Merge branch 'master' of https://github.com/rokkie/apache

Conflicts:
	Dockerfile
	Makefile
reinstated sudo