Dockerfile: ADD /app
Merge branch 'step2' into step4
Merge branch 'step4' into step5
Merge branch 'step5' into step6
Merge pull request #10 from proppy/step6

Step6: switch to /app