Merge branch 'master' into Adam-Jones
Added Alerts for Matt Martin and fixed Valley Bug
Merge branch 'Adam-Jones'

Conflicts:
	main.wire
Merge branch 'Dustin'
Merge branch 'master' into Dustin