j
Merge branch 'master' of https://github.com/dhwani123/project

Conflicts:
	Gemfile.lock
	app/assets/javascripts/application.js
	app/controllers/posts_controller.rb
	app/models/post.rb
	app/views/layouts/application.html.erb
	config/routes.rb
	db/schema.rb