Commit to not Merge
I don't know what I'm doing

halp
Oh jeez it's conflicting

Conflicts:
	WiredCats2415/nbproject/private/private.xml
	WiredCats2415/src/Utilities/WiredVector.java