Stupid Commit II
Merge branch 'master' of https://github.com/wiredCatBruceCrane/WiredCats2014

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