First one
Merge branch 'master' of https://github.com/Chupaka/Infolan.Video

Conflicts:
	README.md