I don't really know what's been happening here in between
Merge branch 'master' of https://github.com/PeachOS/CHP.git

Conflicts:
	docroot/WEB-INF/src/com/test/DataBaseFunctions.java
	docroot/WEB-INF/src/com/test/DatabaseStatements.java
	docroot/WEB-INF/src/com/test/NewPortlet2.java