10 komit konflikti
izmena dodata 3. linija koda
Merge branch 'novagrana'

Conflicts:
	TestProject/app/controllers/Application.java