Added a ToolBox
Merge remote-tracking branch 'origin/addTool'

Conflicts:
	main.java