PSR and Query expander...
Merge branch 'master' of https://github.com/11791-04/project-team04.git

Conflicts:
	src/main/java/util/QueryExpander.java