Added count
this works
Fixed bug
Fixed bug
Fixed count
Bug fixes. This is a working build
Branch
com1
Image to screen
Picture uploading functionality
Merge branch 'master' into matt

Conflicts:
	change.php
	search.php
Merge remote-tracking branch 'origin/evan' into matt