Merge branch 'master' into launcher
Fixing the exiting functions
Merge branch 'launcher' of http://github.com/mkarpoff/414-Research into launcher

Conflicts:
	ResearchProgram/src/Project/launcher.java
Renamed the launcher to be specific to the capture launcher
Merge
Fixing git and eclipse.
Building the stream merger launcher
Started to build the Merger.
Added a FrameGrabber creator That recieves File Objects
Built the merge program. Merge function is not working
In the toFile function. Fixed the not closing bug if this was intention
the this needs to be undone
Merge branch 'launcher'