PMazur: web page hey
mazurp: hello world
Merge remote-tracking branch 'origin/exercise-01' into pawelm-hello-world-page

Conflicts:
	app/AppKernel.php
	app/config/routing.yml
Merge pull request #4 from PawelMazur/pawelm-hello-world-page

mazurp: hello world
Removed travis
Merge pull request #7 from gajdaw-teaching/gajdaw-remove-travis

Removed travis
Merge remote-tracking branch 'origin/exercise-01' into pmazur-hello-world-page

Conflicts:
	app/AppKernel.php
	app/config/routing.yml
Merge pull request #6 from PMazur92/pmazur-hello-world-page

PMazur: web page hey
Merge remote-tracking branch 'origin/exercise-01' into gajdaw-red-page

Conflicts:
	app/AppKernel.php
	app/config/routing.yml