Registered student page changed
conflict fixed
company taable changed
Merge remote-tracking branch 'origin'