Added social features
Merge branch 'master' of https://github.com/ryandougherty/CSE494-Fall-2014-Project1