Created a rails application and added status updates by Nirav
Merge branch 'master' of https://github.com/niravpatel235/nirav

Conflicts:
	Gemfile.lock
	app/assets/stylesheets/bootstrap.css
	app/assets/stylesheets/scaffolds.css.scss
	app/views/layouts/application.html.erb
	config/initializers/secret_token.rb
	config/routes.rb
	db/schema.rb