Youtube iframe API changed to javascript API
Merge branch 'master' of https://github.com/peaceful-lukas/Catch-Up

Conflicts:
	public/js/function.js