added test data for users
Branch
com1
Image to screen
Picture uploading functionality
some changes
Merge branch 'master' into matt

Conflicts:
	change.php
	search.php
Merge remote-tracking branch 'origin/evan' into matt
added script to creat indicies
added drop statements for indicies
searching works