fixed stuff
Merge branch 'master' of github.com:120photo/GA07_social_network