Dodana 2 atributa, i njihovi geteri i seteri
Merge branch 'master' of https://github.com/farisca/SI2013Tim1.git