Added friendship and comments
Merge branch 'master' of github.com:lucponnau/Gatech-Events