re-factoring
Merge branch 'master' of https://github.com/Ferioney/nc_social_library