Revert "Remote Picture"

This reverts commit a266f61cea7b2e7edb7d473118c478f8c0f5b410.
Merge branch 'Zak'

Conflicts:
	CMPT-315.html