Working list
Merge branch 'GUI-Testing' of github.com:ErinCGallagher/QExchange into GUI-Testing

Conflicts:
	QExchange/res/layout/activity_search_result_page.xml
	QExchange/src/com/example/qexchange/SearchResultPage.java