Merge branch 'Gagarina' of https://github.com/ISUCT/OOP_2013.git into Gagarina