changes to search
Merge remote-tracking branch 'origin/master'

Conflicts:
	QExchange/src/com/example/qexchange/AccountPage.java
	QExchange/src/com/example/qexchange/MainPage.java