changing the .gitignore file
making an amenedment to the Student.java file
making commit after conflict resolution