Move if statement for increased clarity
Merge branch 'glib' of github.com:stuycs-softdev/proj2-pd7-08-theRoom into glib

Conflicts:
	templates/search.html