+
Merge branch 'gh-pages' of https://github.com/ZE3kr/video into gh-pages

Conflicts:
	feed1080.xml
	feed720.xml