temp remove video, upload baught photos
Merge remote-tracking branch 'origin/master'

Conflicts:
	stylesheets/etype.main.css