Merge branch 'experimental'

Conflicts:

	hello-world.cpp

dude, git is neat!  decided to not use either comment change

diff --cc hello-world.cpp
index 84919be17ceddf0c675abf93c31c550ab01a48d0,01e749b0c68c533b2dae79e2b23daa6e7d15013c..7d68365d76f153bf8073e24d9bb86514fc125d96
--- 1/hello-world.cpp
--- 2/hello-world.cpp
+++ b/hello-world.cpp
@@@ -45,7 -45,7 +45,8 @@@ void detect_and_draw_objects(IplImage* 
        cvReleaseMemStorage( &storage );
  }
  
- // A Simple Camera Capture Framework.  conflicting change on this line
 -// A Simple Camera Capture Framework.  serious conflict right here
++// A Simple Camera Capture Framework.
++>>>>>>> experimental:hello-world.cpp
  int main( int argc, char** argv )
  {
        CvHaarClassifierCascade* cascade = load_object_detector(argv[1]);