test1
Merge branch 'master' of github.com:MartinGris/WebtechProject

Conflicts:
	WebtechProject/test.txt
Merge branch 'master' of github.com:MartinGris/WebtechProject