Committing changes before pull
Committing before pull
Gradesheet/comment changes
Merge https://github.com/nikhpand/Contest-Judging

Conflicts:
	Gemfile.lock
	db/schema.rb