Changes made by Momchil Tzekoff (momchiltzekoff@gmail.com).
Merge branch 'master' of https://github.com/dokov/hackaton-team12.git