working on addmarks module. This commit is before merging
Merge remote-tracking branch 'origin/master'

Conflicts:
	sms025/WebContent/addmarks.jsp
	sms025/build/classes/com/sms/controller/AddMarksController.class
	sms025/build/classes/com/sms/customtags/RetreiveAssignedSubjects.class
	sms025/src/com/sms/controller/AddMarksController.java
	sms025/src/com/sms/customtags/RetreiveAssignedSubjects.java