commit to resolve conflicts
commit to resolve conflicts
implemented SQLQueries.getUserHistory().  2 new classes were needed.  Junit test cases were also written
recommit of last commit
Merge branch 'Andrew-branch'

Conflicts:
	eclipseClientProject/GolfrClient/bin/GolfrClient.apk
	eclipseClientProject/GolfrClient/bin/classes.dex