Committing Stanislav Gospodinov and Hristiyan Velyakov second fixtures
Merge branch 'master' of https://github.com/thebravoman/software_engineering_2014

lly if it merges an updated upstream into a topic branch.
Merge branch 'master' of https://github.com/thebravoman/software_engineering_2014