index changes
Merge branch 'master' of https://github.com/latuprez/armontdevelopment
edited social stuff on index
merged