Minor modifcations
Merge branch 'filter-search-expr' of https://github.com/adairdavid/SENG403G1 into filter-search-expr

Conflicts:
	app/views/catalogue/index.html.erb
Modified fail search page