silly commit
Merge branch 'master' of https://github.com/wiredCatBruceCrane/WiredCats2014

Conflicts:
	WiredCats2014/nbproject/project.bak.xml
	WiredCats2014/nbproject/project.xml