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

Conflicts:
	Dockerfile
Merge branch 'step4' into step5
Dockerfile: ADD requirements.txt /app/
Merge branch 'step5' into step6

Conflicts:
	Dockerfile