a lotta changes
Merge branch 'master' of https://github.com/anivader1789/Wildfire

Conflicts:
	Wildfire.xcodeproj/project.pbxproj
	Wildfire/MergeVideo.h
	Wildfire/MergeVideo.m
fix