July 24, 2014 3:15pm -- Updated main to save non-collision video as well.
!!About to reinstall opencv for troubleshooting purpose
Merge branch 'master' of https://github.com/UCSD-E4E/AngryBirds

Conflicts:
	main.cpp