3. izmainas
4. izmainjas
Merge branch 'new2' into new

Conflicts:
	app/views/hello1.blade.php