relinked feature icons to correct images
twitter dribble github links
edit show icons
fixed positioning on nav bar and added mustached-man
added larger mugshot for about page
fixed views and likes to use a tags instead of forms
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'

* upstream/master:
  edit show icons
  twitter dribble github links
  changed hot dog
  svg images

Conflicts:
	app/views/pages/index.html.erb
	app/views/users/show.html.erb
Merge remote-tracking branch 'upstream/master'

* upstream/master:
  fixed views and likes to use a tags instead of forms
Merge remote-tracking branch 'upstream/master'
Add sort by to Pages controller
Merge remote-tracking branch 'upstream/master'
fixed logic statements for social media links
Added sorting to Contents controller
Added sorting
remove .DS_store
Added a fade effect to the description on cards.
Merge remote-tracking branch 'upstream/master'

* upstream/master:
  remove .DS_store
add gemfile.lock for heroku push
re remove gemfile.lock