Amended README again
solve merging
Conflict resolution
Added student