changes to videos
Merge branch 'develop' of https://github.com/johnotaalo/PhilosophicalAnthropology into develop

Conflicts:
	assets/css/main.css