Popravka & test dodan
Merge branch 'master' of https://github.com/farisca/SI2013Tim1.git