merge
Merge branch 'master' of git://github.com/sciunto/VideoMaker

Conflicts:
	videomaker.py