Merge branch 'master' of https://github.com/zlatkoflash/stats_project

Conflicts:
	nbproject/private/private.xml

Slavica