some comments added, mainly in Application class
comment added for student.java
conflicts resloved