New Version  Boss behavior++
Merge branch 'Gui'

Conflicts:
	.DS_Store
	CoryDash.js