fixed bugs per HW7 instructions
added social buttons
added social buttons
Merge branch 'develop' into staging