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

Conflicts:
	Gemfile
	Gemfile.lock
	app/models/cubestudent.rb
	app/views/layouts/application.html.erb
error
e