lost some changes
added youtube video placeholders
merged Erics and Vincents changes