display !
Merge branch 'master' of https://github.com/Hack-a-Trip/Hack-a-Trip.git

Conflicts:
	Hack-a-Trip/war/header.jsp