Merge branch 'master' of https://github.com/Haris-Hasic/SI2013Tim6.git
Merge branch 'master' of https://github.com/Haris-Hasic/SI2013Tim6