relinked feature icons to correct images
fixed positioning on nav bar and added mustached-man
added larger mugshot for about page
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