"updated gemfile, added share buttons to application.html.haml"
Merge branch 'master' of https://github.com/mknicos/squmblr

update
Added social media buttons and created post show page
Removed unused gem
updated Gemfile
Wrote Unit tests for username validation and included the
shoulda-matchers gem.
Removed shoulda-matchers gem (redundant), moved share buttons into
partials (views/social_buttons), converted existing html into haml.
Renamed /social_buttons to /shared, used url helper
Merge branch 'master' of github.com:mattLummus/squmblr into mattLummus-master

* 'master' of github.com:mattLummus/squmblr:
  Renamed /social_buttons to /shared, used url helper
  Removed shoulda-matchers gem (redundant), moved share buttons into partials (views/social_buttons), converted existing html into haml.
  Wrote Unit tests for username validation and included the shoulda-matchers gem.
  updated Gemfile
  Removed unused gem
  Added social media buttons and created post show page
  "updated gemfile, added share buttons to application.html.haml"

Conflicts:
	Gemfile.lock
	app/controllers/posts_controller.rb
	app/views/layouts/application.html.haml
	app/views/posts/index.html.haml
	config/routes.rb
Merge branch 'mattLummus-master'

* mattLummus-master:
  Renamed /social_buttons to /shared, used url helper
  Removed shoulda-matchers gem (redundant), moved share buttons into partials (views/social_buttons), converted existing html into haml.
  Wrote Unit tests for username validation and included the shoulda-matchers gem.
  updated Gemfile
  Removed unused gem
  Added social media buttons and created post show page
  "updated gemfile, added share buttons to application.html.haml"