even better
change
Merge branch 'master' of https://github.com/shamidreza/CS606-RP-assignment into shamidreza-master
Merge branch 'shamidreza-master'
Merge branch 'master' of https://github.com/kylebgorman/CS606-RP-assignment

Conflicts:
	attendance.txt