Dockerfile: ADD /app/
Merge branch 'step2' into step3
Merge branch 'step3' into step4

Conflicts:
	Dockerfile