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

Conflicts:
	Hack-a-Trip/src/net/tncy/servlet/DisplayTravelStep1.java
	Hack-a-Trip/war/WEB-INF/appengine-generated/datastore-indexes-auto.xml
	Hack-a-Trip/war/displayTravelStep1.jsp
Merge branch 'master' of https://github.com/Hack-a-Trip/Hack-a-Trip.git

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