Regextest
Merge branch 'Filippova_I_V' of https://github.com/ISUCT/OOP_2014 into Filippova_I_V