edit dockerfile
edit dockerfile
make deploy
edit deploy
edit my git profile
pull upstream
complete deploy
edit deploy
Merge pull request #86 from korniste/master

make deploy
projects/templates/projects/project_page.html : conflict fixed