yeah
Merge branch 'master' of github.com:BLNorris/flipbook into social_media

Conflicts:
	app/views/public/profile.html.erb
Merge branch 'master' of github.com:BLNorris/flipbook into social_media
finished with the social share buttons, need to style them
Merge branch 'master' of github.com:BLNorris/flipbook into social_media
Merge pull request #50 from BLNorris/social_media

Social media