:gun:downloded foundation and bootstrap files
:fixed the application.html.haml file
:car: Deleted the unused view files and also deletedfoundation and bootstrap
:banana: deleted the edit registration view file
:flower: edited the css for the shared page and home page
Merge remote-tracking branch 'upstream/master'

Conflicts:
	app/views/devise/sessions/new.html.haml
	app/views/devise/shared/_links.haml
Merge remote-tracking branch 'upstream/master'

Conflicts:
	app/views/devise/sessions/new.html.haml
	app/views/devise/shared/_links.haml
Merge branch 'style'

Conflicts:
	app/views/devise/sessions/new.html.haml
	app/views/devise/shared/_links.haml
:car: Comments are implemented with some tests
updated the comments to include username
:bird: Removed the unused files and fixed the render for comment view
:bird: removed the unused route and post variable in the post controller
Merge branch 'comments' of github.com:samtes/squmblr into samtes-comments

* 'comments' of github.com:samtes/squmblr:
  :bird: removed the unused route and post variable in the post controller
  :bird: Removed the unused files and fixed the render for comment view
  updated the comments to include username
  :car: Comments are implemented with some tests
  :flower: edited the css for the shared page and home page
  :banana: deleted the edit registration view file
  :car: Deleted the unused view files and also deletedfoundation and bootstrap
  :gun:downloded foundation and bootstrap files

Conflicts:
	Gemfile
	app/models/post.rb
	app/models/user.rb
	app/views/layouts/application.html.haml
	app/views/posts/index.html.haml
	app/views/posts/show.html.haml
	config/database.example.yml
	config/routes.rb
	db/schema.rb
Refactor comments.
Merge branch 'samtes-comments'

* samtes-comments:
  Refactor comments.
  :bird: removed the unused route and post variable in the post controller
  :bird: Removed the unused files and fixed the render for comment view
  updated the comments to include username
  :car: Comments are implemented with some tests
  :flower: edited the css for the shared page and home page
  :banana: deleted the edit registration view file
  :car: Deleted the unused view files and also deletedfoundation and bootstrap
  :gun:downloded foundation and bootstrap files