bugfix
Merge branch 'master' of https://github.com/DzenanaMahmutspahic/SI2013Tim8.git
bugfix2