commit
Merge branch 'master' of https://github.com/softwarekitty/passchip

Conflicts:
	src/main/java/com/appspot/passchip_service/TestServlet.java
	src/main/webapp/ui.jsp
Merge branch 'master' of https://github.com/softwarekitty/passchip

ot sure...fixing merge