to test conflict with gigoy
new commit from anas
Merge branch 'master' of
https://github.com/anasameer/trainReservationSystem

Conflicts:
	trainReservationSystem/Web/pages/test.jsp