Initial
Merge branch 'master' of https://github.com/Atre/noo_cupid_test_2