~
Merge branch 'curent' of https://github.com/JKorytko1/project2014 into curent