Merge branch 'master' of https://github.com/geralab/web-app-project

Conflicts:
hello.txt