TEst
Test
Test 2
Merge branch 'master' of ssh://94.23.242.93:8523/var/www/dev/sf-mineweb

Conflicts:
	src/Ovski/MinecraftWebsiteBundle/Resources/views/en/home.html.twig
Test 3
Remove "Test 3"
Merge branch 'master' of ssh://ovski.net/var/git-repositories/dev/www/mineweb

Conflicts:
	src/Ovski/MinecraftWebsiteBundle/Resources/views/en/home.html.twig