Updated Files
Changes
Changed GitIgnore file
Small Changes
Git Wants me to commit again
stop
Changes
Added size method
Update .gitignore

Made it less stupid...
Merged Kellys with mine
Merging
comit
Revert "Merging"

This reverts commit c19d406bd3a3a569905a260f919c0224c76a4222.
Revert "Merged Kellys with mine"

This reverts commit f9b825c2004a5e8a906bd2fcb2dfaa1923d7296f.
Trying to merge
Removed extra files
Updated Menu Bar

Updated Menu Bar.  "New Project" still needs to be flushed out.
Merge branch 'Pres' into Kelly

Conflicts:
	Pantimator/bin/pantimator/Listener$LisState$1.class
	Pantimator/bin/pantimator/Listener$LisState$3.class
	Pantimator/bin/pantimator/Listener$LisState$6.class
	Pantimator/src/pantimator/AnimationPane.java
MERGED EVERYONES SHIT TOGETHER FINALLY URGHHH animation pane, color
wheel, sounds, cursors, marks menubar
Merge branch 'Kelly'

Conflicts:
	.idea/workspace.xml
	Pantimator/bin/pantimator/LayeredPanel$Layer.class
	Pantimator/bin/pantimator/LayeredPanel.class
	Pantimator/bin/pantimator/Listener$LisState$1.class
	Pantimator/bin/pantimator/Listener$LisState$2.class
	Pantimator/bin/pantimator/Listener$LisState$3.class
	Pantimator/bin/pantimator/Listener$LisState$6.class
	Pantimator/bin/pantimator/Listener$LisState$7.class
	Pantimator/bin/pantimator/Listener$LisState.class
	Pantimator/bin/pantimator/Listener.class
	Pantimator/bin/pantimator/Paintimator.class
	Pantimator/src/pantimator/AnimationPane.java
	Pantimator/src/pantimator/ColorWheelPanel.java
	Pantimator/src/pantimator/Listener.java
	Pantimator/src/pantimator/OptionsPanel.java
	Pantimator/src/pantimator/Paintimator.java
	Pantimator/src/pantimator/ToolPanel.java