Initial commit
Merge branch 'master' of https://github.com/Reflexip/Test2014Gr1.git