test for conflict
Merge branch 'master' of
https://github.com/FurnitureStoreOrg/FurnitureStore.git

Conflicts:
	FurnitureStoreWeb/src/com/furniture/managedbean/showproduct/SearchResultsBean.java