committing to subranch
committing to subranch
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'

Conflicts:
	student.py
Edited student.py