added edge case handling and trimmed strings and added test for StringQuery.java
Merge branch 'master' of https://github.com/dthiemann/OOSD_project_part3