Update user profile to display user.resume and user.about.  Also add links to social media on user profile page.
Merge branch 'master' of https://github.com/kendram23/devsfornonprofits

Conflicts:
	config/routes.rb