Merge branch 'AleksandraGagarina' of https://github.com/ISUCT/ISUCT_2012.git into AleksandraGagarina