Updated .gitignore in attempt to fix the inclusion if undesired files/folders
Removed Settings/SD.pmo from git but cached the file
Post clean push
Added Frame Grabber

Still need to test frame grabber. BufferedWrapper now uses a long
instead of an int.
Merge branch 'master' of https://github.com/PorMMo/PorMMo

Conflicts:
	target/classes/project/senior/app/pormmo/BufferedWrapper.class
	target/classes/project/senior/app/pormmo/ExtFileFilter.class
	target/classes/project/senior/app/pormmo/FilterPanel$1.class
	target/classes/project/senior/app/pormmo/FilterPanel$2.class
	target/classes/project/senior/app/pormmo/FilterPanel$3.class
	target/classes/project/senior/app/pormmo/FilterPanel$4.class
	target/classes/project/senior/app/pormmo/FrameGrabber.class
	target/classes/project/senior/app/pormmo/HSBPanel$1.class
	target/classes/project/senior/app/pormmo/HSBPanel$SliderListener.class
	target/classes/project/senior/app/pormmo/HSBPanel$cButtonListener.class
	target/classes/project/senior/app/pormmo/OutputPanel$1.class
	target/classes/project/senior/app/pormmo/OutputPanel$2.class
	target/classes/project/senior/app/pormmo/OutputPanel.class
	target/classes/project/senior/app/pormmo/SaveUnit.class
	target/classes/project/senior/app/pormmo/SettingsDock$SizeChangeListener.class
	target/classes/project/senior/app/pormmo/SettingsDock$SliderListener.class
	target/classes/project/senior/app/pormmo/TolerancePanel$1.class
	target/classes/project/senior/app/pormmo/TolerancePanel$2.class
	target/classes/project/senior/app/pormmo/UserInterfaceFrame$FrameListener.class
	target/classes/project/senior/app/pormmo/UserInterfaceFrame$MediaControlsButtonListener.class
	target/classes/project/senior/app/pormmo/UserInterfaceFrame$MediaControlsCheckBoxListener.class
	target/classes/project/senior/app/pormmo/UserInterfaceFrame$MediaControlsSliderListener.class
	target/classes/project/senior/app/pormmo/UserInterfaceFrame$PlayerEventListener.class
	target/classes/project/senior/app/pormmo/UserInterfaceFrame$UserInterfaceFrameMenuListener.class
	target/classes/project/senior/app/pormmo/UserInterfaceFrame.class
Squash