first commit
Merge branch 'master' of https://github.com/szatti1489/social_test.V_1_0.1501131623